summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore6
-rw-r--r--app-admin/checksec/ChangeLog20
-rw-r--r--app-admin/checksec/Manifest1
-rw-r--r--app-admin/checksec/checksec-1.5.ebuild27
-rw-r--r--app-admin/checksec/files/_checksec18
-rw-r--r--app-admin/checksec/metadata.xml (renamed from games-action/trackballs/metadata.xml)2
-rw-r--r--app-admin/flexlm/Manifest5
-rw-r--r--app-admin/flexlm/files/90flexlm3
-rw-r--r--app-admin/flexlm/files/flexlm-conf13
-rw-r--r--app-admin/flexlm/files/flexlm-init19
-rw-r--r--app-admin/flexlm/flexlm-9.5-r2.ebuild77
-rw-r--r--app-admin/flexlm/metadata.xml5
-rw-r--r--app-admin/sudox/ChangeLog99
-rw-r--r--app-admin/sudox/Manifest2
-rw-r--r--app-admin/sudox/metadata.xml2
-rw-r--r--app-admin/sudox/sudox-10.0.ebuild34
-rw-r--r--app-admin/sudox/sudox-3.20.ebuild29
-rw-r--r--app-arch/archwrap/ChangeLog162
-rw-r--r--app-arch/archwrap/Manifest2
-rw-r--r--app-arch/archwrap/archwrap-1.26.ebuild (renamed from app-arch/archwrap/archwrap-11.4.ebuild)18
-rw-r--r--app-arch/archwrap/metadata.xml2
-rw-r--r--app-arch/bzwc/ChangeLog86
-rw-r--r--app-arch/bzwc/Manifest2
-rw-r--r--app-arch/bzwc/bzwc-2.18.ebuild (renamed from app-arch/bzwc/bzwc-5.1.ebuild)14
-rw-r--r--app-arch/bzwc/metadata.xml2
-rw-r--r--app-arch/paq8l/Manifest1
-rw-r--r--app-arch/paq8l/paq8l-20070308.ebuild29
-rw-r--r--app-cdr/cdrtools/cdrtools-99999999.ebuild16
-rw-r--r--app-cdr/cdrtools/metadata.xml19
-rw-r--r--app-dicts/ispell-de-alt/Manifest2
-rw-r--r--app-dicts/ispell-de-alt/ispell-de-alt-2-r1.ebuild30
-rw-r--r--app-dicts/ispell-de-alt/metadata.xml4
-rw-r--r--app-dicts/ispell-de/Manifest1
-rw-r--r--app-dicts/ispell-de/ispell-de-20161207.ebuild36
-rw-r--r--app-dicts/ispell-de/metadata.xml4
-rw-r--r--app-dicts/stardict-dictd-BritannicaConcise/ChangeLog19
-rw-r--r--app-dicts/stardict-dictd-BritannicaConcise/Manifest2
-rw-r--r--app-dicts/stardict-dictd-BritannicaConcise/metadata.xml2
-rw-r--r--app-dicts/stardict-dictd-BritannicaConcise/stardict-dictd-BritannicaConcise-2.4.2.ebuild17
-rw-r--r--app-dicts/stardict-dictd-cced/ChangeLog19
-rw-r--r--app-dicts/stardict-dictd-cced/Manifest2
-rw-r--r--app-dicts/stardict-dictd-cced/metadata.xml2
-rw-r--r--app-dicts/stardict-dictd-cced/stardict-dictd-cced-2.4.2.ebuild16
-rw-r--r--app-dicts/stardict-dictd-longman/ChangeLog19
-rw-r--r--app-dicts/stardict-dictd-longman/Manifest2
-rw-r--r--app-dicts/stardict-dictd-longman/metadata.xml2
-rw-r--r--app-dicts/stardict-dictd-longman/stardict-dictd-longman-2.4.2.ebuild17
-rw-r--r--app-dicts/stardict-dictd-merrianwebster/ChangeLog19
-rw-r--r--app-dicts/stardict-dictd-merrianwebster/Manifest2
-rw-r--r--app-dicts/stardict-dictd-merrianwebster/metadata.xml2
-rw-r--r--app-dicts/stardict-dictd-merrianwebster/stardict-dictd-merrianwebster-2.4.2.ebuild17
-rw-r--r--app-dicts/stardict-dictd-oald/ChangeLog19
-rw-r--r--app-dicts/stardict-dictd-oald/Manifest2
-rw-r--r--app-dicts/stardict-dictd-oald/metadata.xml2
-rw-r--r--app-dicts/stardict-dictd-oald/stardict-dictd-oald-2.4.2.ebuild17
-rw-r--r--app-dicts/stardict-dictd-thesaurus-ee/ChangeLog19
-rw-r--r--app-dicts/stardict-dictd-thesaurus-ee/Manifest2
-rw-r--r--app-dicts/stardict-dictd-thesaurus-ee/metadata.xml2
-rw-r--r--app-dicts/stardict-dictd-thesaurus-ee/stardict-dictd-thesaurus-ee-2.4.2.ebuild17
-rw-r--r--app-dicts/stardict-freedict-deu-eng/ChangeLog22
-rw-r--r--app-dicts/stardict-freedict-deu-eng/Manifest2
-rw-r--r--app-dicts/stardict-freedict-deu-eng/metadata.xml2
-rw-r--r--app-dicts/stardict-freedict-deu-eng/stardict-freedict-deu-eng-2.4.2.ebuild17
-rw-r--r--app-dicts/stardict-freedict-deu-ita/ChangeLog19
-rw-r--r--app-dicts/stardict-freedict-deu-ita/Manifest2
-rw-r--r--app-dicts/stardict-freedict-deu-ita/metadata.xml2
-rw-r--r--app-dicts/stardict-freedict-deu-ita/stardict-freedict-deu-ita-2.4.2.ebuild17
-rw-r--r--app-dicts/stardict-freedict-ita-deu/ChangeLog19
-rw-r--r--app-dicts/stardict-freedict-ita-deu/Manifest2
-rw-r--r--app-dicts/stardict-freedict-ita-deu/metadata.xml2
-rw-r--r--app-dicts/stardict-freedict-ita-deu/stardict-freedict-ita-deu-2.4.2.ebuild17
-rw-r--r--app-dicts/steak/Manifest1
-rw-r--r--app-dicts/steak/files/steak-1.7.3.patch18
-rw-r--r--app-dicts/steak/metadata.xml4
-rw-r--r--app-dicts/steak/steak-1.7.3-r3.ebuild53
-rw-r--r--app-emacs/mv_emacs/ChangeLog41
-rw-r--r--app-emacs/mv_emacs/Manifest2
-rw-r--r--app-emacs/mv_emacs/metadata.xml2
-rw-r--r--app-emacs/mv_emacs/mv_emacs-1.2.ebuild (renamed from app-emacs/mv_emacs/mv_emacs-1.4-r1.ebuild)19
-rw-r--r--app-eselect/eselect-net/Manifest1
-rw-r--r--app-eselect/eselect-net/eselect-net-0.2-r1.ebuild21
-rw-r--r--app-misc/knapsack/Manifest1
-rw-r--r--app-misc/knapsack/knapsack-7.3.ebuild19
-rw-r--r--app-misc/knapsack/metadata.xml16
-rw-r--r--app-misc/machine-learning-mv/Manifest1
-rw-r--r--app-misc/machine-learning-mv/machine-learning-mv-1.3.ebuild30
-rw-r--r--app-misc/machine-learning-mv/metadata.xml16
-rw-r--r--app-mobilephone/adb-sync/Manifest1
-rw-r--r--app-mobilephone/adb-sync/adb-sync-0_p20190101.ebuild32
-rw-r--r--app-mobilephone/adb-sync/metadata.xml12
-rw-r--r--app-portage/changelog-gitrepo/Manifest1
-rw-r--r--app-portage/changelog-gitrepo/changelog-gitrepo-1.1.ebuild21
-rw-r--r--app-portage/changelog-gitrepo/metadata.xml16
-rw-r--r--app-portage/eix/ChangeLog54
-rw-r--r--app-portage/eix/Manifest1
-rw-r--r--app-portage/eix/eix-0.35.2.ebuild160
-rw-r--r--app-portage/eix/eix-99999999.ebuild198
-rw-r--r--app-portage/eix/metadata.xml59
-rw-r--r--app-portage/etcat/Manifest1
-rw-r--r--app-portage/etcat/etcat-1.0.2.ebuild39
-rw-r--r--app-portage/etcat/etcat-99999999.ebuild39
-rw-r--r--app-portage/etcat/metadata.xml16
-rw-r--r--app-portage/find_cruft/ChangeLog88
-rw-r--r--app-portage/find_cruft/Manifest2
-rw-r--r--app-portage/find_cruft/find_cruft-3.0.7.ebuild (renamed from app-portage/find_cruft/find_cruft-5.2.ebuild)17
-rw-r--r--app-portage/find_cruft/metadata.xml2
-rw-r--r--app-portage/getdelta/ChangeLog60
-rw-r--r--app-portage/getdelta/Manifest2
-rw-r--r--app-portage/getdelta/getdelta-0.7.9-r2.ebuild23
-rw-r--r--app-portage/getdelta/metadata.xml30
-rw-r--r--app-portage/logclean/ChangeLog112
-rw-r--r--app-portage/logclean/Manifest2
-rw-r--r--app-portage/logclean/logclean-18.4.1.ebuild45
-rw-r--r--app-portage/logclean/logclean-9.8-r1.ebuild39
-rw-r--r--app-portage/logclean/metadata.xml2
-rw-r--r--app-portage/portage-bashrc-mv/ChangeLog185
-rw-r--r--app-portage/portage-bashrc-mv/Manifest2
-rw-r--r--app-portage/portage-bashrc-mv/metadata.xml8
-rw-r--r--app-portage/portage-bashrc-mv/portage-bashrc-mv-13.6.ebuild45
-rw-r--r--app-portage/portage-bashrc-mv/portage-bashrc-mv-20.3.ebuild55
-rw-r--r--app-portage/portage-postsyncd-mv/Manifest1
-rw-r--r--app-portage/portage-postsyncd-mv/metadata.xml19
-rw-r--r--app-portage/portage-postsyncd-mv/portage-postsyncd-mv-8.4.ebuild75
-rw-r--r--app-portage/trickyfetch/ChangeLog145
-rw-r--r--app-portage/trickyfetch/Manifest2
-rw-r--r--app-portage/trickyfetch/metadata.xml2
-rw-r--r--app-portage/trickyfetch/trickyfetch-8.7.ebuild (renamed from app-portage/trickyfetch/trickyfetch-10.1.ebuild)15
-rw-r--r--app-portage/useflags/ChangeLog89
-rw-r--r--app-portage/useflags/Manifest2
-rw-r--r--app-portage/useflags/metadata.xml2
-rw-r--r--app-portage/useflags/useflags-3.4.ebuild37
-rw-r--r--app-portage/useflags/useflags-4.2.ebuild37
-rw-r--r--app-portage/world-mv/ChangeLog102
-rw-r--r--app-portage/world-mv/Manifest2
-rw-r--r--app-portage/world-mv/metadata.xml2
-rw-r--r--app-portage/world-mv/world-mv-3.14.ebuild (renamed from app-portage/world-mv/world-mv-3.20.ebuild)22
-rw-r--r--app-shells/auto-fu-zsh/ChangeLog50
-rw-r--r--app-shells/auto-fu-zsh/Manifest3
-rw-r--r--app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild30
-rw-r--r--app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12_p0.ebuild133
-rw-r--r--app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild30
-rw-r--r--app-shells/auto-fu-zsh/metadata.xml2
-rw-r--r--app-shells/command-not-found/ChangeLog26
-rw-r--r--app-shells/command-not-found/Manifest1
-rw-r--r--app-shells/command-not-found/command-not-found-0.4.5.ebuild49
-rw-r--r--app-shells/command-not-found/metadata.xml (renamed from app-eselect/eselect-net/metadata.xml)9
-rw-r--r--app-shells/dash/dash-99999999.ebuild83
-rw-r--r--app-shells/dash/files/dumb-echo.patch92
-rw-r--r--app-shells/dash/metadata.xml23
-rw-r--r--app-shells/fast-syntax-highlighting/Manifest1
-rw-r--r--app-shells/fast-syntax-highlighting/fast-syntax-highlighting-1.5.5.ebuild52
-rw-r--r--app-shells/fast-syntax-highlighting/fast-syntax-highlighting-99999999.ebuild52
-rw-r--r--app-shells/fast-syntax-highlighting/metadata.xml12
-rw-r--r--app-shells/oh-my-zsh/ChangeLog30
-rw-r--r--app-shells/oh-my-zsh/metadata.xml3
-rw-r--r--app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild30
-rw-r--r--app-shells/push/Manifest1
-rw-r--r--app-shells/push/metadata.xml16
-rw-r--r--app-shells/push/push-3.4.ebuild29
-rw-r--r--app-shells/quoter/Manifest1
-rw-r--r--app-shells/quoter/metadata.xml16
-rw-r--r--app-shells/quoter/quoter-4.2.ebuild23
-rw-r--r--app-shells/runtitle/ChangeLog71
-rw-r--r--app-shells/runtitle/Manifest2
-rw-r--r--app-shells/runtitle/metadata.xml2
-rw-r--r--app-shells/runtitle/runtitle-2.7.ebuild (renamed from app-shells/runtitle/runtitle-2.11.ebuild)12
-rw-r--r--app-shells/schily-tools/Manifest1
-rw-r--r--app-shells/schily-tools/files/cdrtools-fix-clone-uclibc.patch69
-rw-r--r--app-shells/schily-tools/files/strlcat-mapvers.patch16
-rw-r--r--app-shells/schily-tools/metadata.xml59
-rw-r--r--app-shells/schily-tools/schily-tools-2021.04.21.ebuild521
-rw-r--r--app-shells/set_prompt/ChangeLog135
-rw-r--r--app-shells/set_prompt/Manifest2
-rw-r--r--app-shells/set_prompt/metadata.xml2
-rw-r--r--app-shells/set_prompt/set_prompt-1.22.ebuild33
-rw-r--r--app-shells/set_prompt/set_prompt-3.2.ebuild31
-rw-r--r--app-shells/termcolors-mv/ChangeLog89
-rw-r--r--app-shells/termcolors-mv/Manifest2
-rw-r--r--app-shells/termcolors-mv/metadata.xml3
-rw-r--r--app-shells/termcolors-mv/termcolors-mv-3.11.ebuild (renamed from app-shells/termcolors-mv/termcolors-mv-4.8.ebuild)25
-rw-r--r--app-shells/zsh-autosuggestions/Manifest1
-rw-r--r--app-shells/zsh-autosuggestions/metadata.xml12
-rw-r--r--app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.4.ebuild53
-rw-r--r--app-shells/zsh-autosuggestions/zsh-autosuggestions-99999999.ebuild53
-rw-r--r--app-shells/zsh-completions/ChangeLog46
-rw-r--r--app-shells/zsh-completions/Manifest1
-rw-r--r--app-shells/zsh-completions/metadata.xml41
-rw-r--r--app-shells/zsh-completions/zsh-completions-0.12.0.ebuild123
-rw-r--r--app-shells/zsh-completions/zsh-completions-99999999.ebuild123
-rw-r--r--app-shells/zsh-syntax-highlighting/ChangeLog64
-rw-r--r--app-shells/zsh-syntax-highlighting/Manifest2
-rw-r--r--app-shells/zsh-syntax-highlighting/metadata.xml2
-rw-r--r--app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.1.ebuild52
-rw-r--r--app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.8.0_alpha1.ebuild74
-rw-r--r--app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild58
-rw-r--r--app-shells/zsh/ChangeLog136
-rw-r--r--app-shells/zsh/Manifest2
-rw-r--r--app-shells/zsh/files/prompt_gentoo_setup-133
-rw-r--r--app-shells/zsh/files/zprofile-143
-rw-r--r--app-shells/zsh/files/zsh-5.1.0-gcc-5.patch16
-rw-r--r--app-shells/zsh/files/zsh-init.d-gentoo-r1.diff30
-rw-r--r--app-shells/zsh/metadata.xml40
-rw-r--r--app-shells/zsh/zsh-5.1.1-r1.ebuild301
-rw-r--r--app-shells/zsh/zsh-99999999.ebuild301
-rw-r--r--app-shells/zshrc-mv/ChangeLog149
-rw-r--r--app-shells/zshrc-mv/Manifest2
-rw-r--r--app-shells/zshrc-mv/metadata.xml2
-rw-r--r--app-shells/zshrc-mv/zshrc-mv-2.22.ebuild34
-rw-r--r--app-shells/zshrc-mv/zshrc-mv-6.6.ebuild31
-rw-r--r--app-text/ispell/Manifest1
-rw-r--r--app-text/ispell/ispell-3.4.00-r1.ebuild62
-rw-r--r--app-text/ispell/metadata.xml7
-rw-r--r--app-text/lesspipe/Manifest1
-rw-r--r--app-text/lesspipe/lesspipe-1.85.ebuild248
-rw-r--r--app-text/lesspipe/lesspipe-99999999.ebuild248
-rw-r--r--app-text/mbtpdfasm/Manifest2
-rw-r--r--app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff37
-rw-r--r--app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff11
-rw-r--r--app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff101
-rw-r--r--app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff26
-rw-r--r--app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild71
-rw-r--r--app-text/mbtpdfasm/metadata.xml9
-rw-r--r--app-text/psjoin/ChangeLog6
-rw-r--r--app-text/psjoin/Manifest2
-rw-r--r--app-text/psjoin/metadata.xml2
-rw-r--r--app-text/psjoin/psjoin-0.3.ebuild19
-rw-r--r--app-text/stardict/ChangeLog30
-rw-r--r--app-text/stardict/Manifest3
-rw-r--r--app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch39
-rw-r--r--app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch38
-rw-r--r--app-text/stardict/files/stardict-strip-canberra.patch33
-rw-r--r--app-text/stardict/metadata.xml67
-rw-r--r--app-text/stardict/stardict-3.0.6-r4.ebuild219
-rw-r--r--app-text/stardict/stardict-3.0.6.ebuild144
-rw-r--r--app-text/stardict/stardict-4.0.0_pre20170304.ebuild242
-rw-r--r--dev-cpp/cpplint/ChangeLog90
-rw-r--r--dev-cpp/cpplint/cpplint-99999999.ebuild24
-rw-r--r--dev-cpp/cpplint/files/cpplint-python3.patch70
-rw-r--r--dev-cpp/cpplint/metadata.xml5
-rw-r--r--dev-libs/osformat/Manifest1
-rw-r--r--dev-libs/osformat/metadata.xml16
-rw-r--r--dev-libs/osformat/osformat-1.0.7.ebuild20
-rw-r--r--dev-libs/osformat/osformat-999999999.ebuild36
-rw-r--r--dev-libs/weston/Manifest2
-rw-r--r--dev-libs/weston/files/README.gentoo9
-rw-r--r--dev-libs/weston/files/pam-6.0.93.patch133
-rw-r--r--dev-libs/weston/files/pam-meson.patch37
-rw-r--r--dev-libs/weston/files/pam.patch164
-rw-r--r--dev-libs/weston/metadata.xml25
-rw-r--r--dev-libs/weston/weston-5.0.0-r1.ebuild147
-rw-r--r--dev-libs/weston/weston-8.0.0.ebuild153
-rw-r--r--dev-perl/File-lchown/ChangeLog14
-rw-r--r--dev-perl/File-lchown/File-lchown-0.20-r1.ebuild11
-rw-r--r--dev-perl/File-lchown/Manifest2
-rw-r--r--dev-perl/File-lchown/metadata.xml4
-rw-r--r--dev-python/PyPDF2/Manifest1
-rw-r--r--dev-python/PyPDF2/PyPDF2-1.26.0.ebuild32
-rw-r--r--dev-python/PyPDF2/files/PyPDF2-1.26.0-py3-tests.patch35
-rw-r--r--dev-python/PyPDF2/metadata.xml12
-rw-r--r--dev-tex/chklref/ChangeLog58
-rw-r--r--dev-tex/chklref/Manifest3
-rw-r--r--dev-tex/chklref/chklref-2.6.0.ebuild30
-rw-r--r--dev-tex/chklref/chklref-2.6.1_alpha20170913.ebuild48
-rw-r--r--dev-tex/chklref/metadata.xml2
-rw-r--r--dev-util/ccache/ChangeLog24
-rw-r--r--dev-util/ccache/ccache-99999999-r3.ebuild73
-rw-r--r--dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch21
-rw-r--r--dev-util/ccache/files/ccache-3.1.7-no-perl.patch15
-rw-r--r--dev-util/ccache/files/ccache-config-397
-rw-r--r--dev-util/ccache/metadata.xml12
-rw-r--r--dev-util/comp/Manifest1
-rw-r--r--dev-util/comp/comp-4.3.1.ebuild38
-rw-r--r--dev-util/comp/metadata.xml16
-rw-r--r--dev-util/diffhelp/ChangeLog76
-rw-r--r--dev-util/diffhelp/Manifest2
-rw-r--r--dev-util/diffhelp/diffhelp-1.9.ebuild (renamed from dev-util/diffhelp/diffhelp-1.12.ebuild)16
-rw-r--r--dev-util/diffhelp/metadata.xml2
-rw-r--r--dev-util/mv_perl/ChangeLog144
-rw-r--r--dev-util/mv_perl/Manifest2
-rw-r--r--dev-util/mv_perl/metadata.xml2
-rw-r--r--dev-util/mv_perl/mv_perl-2.49.ebuild37
-rw-r--r--dev-util/mv_perl/mv_perl-4.2.ebuild41
-rw-r--r--dev-util/pyrep/ChangeLog54
-rw-r--r--dev-util/pyrep/Manifest2
-rw-r--r--dev-util/pyrep/metadata.xml2
-rw-r--r--dev-util/pyrep/pyrep-1.4-r1.ebuild33
-rw-r--r--dev-util/pyrep/pyrep-1.5-r1.ebuild30
-rw-r--r--dev-util/replacer/Manifest1
-rw-r--r--dev-util/replacer/metadata.xml16
-rw-r--r--dev-util/replacer/replacer-3.3.ebuild54
-rw-r--r--dev-vcs/git-wrappers-mv/Manifest1
-rw-r--r--dev-vcs/git-wrappers-mv/git-wrappers-mv-2.2.ebuild34
-rw-r--r--dev-vcs/git-wrappers-mv/metadata.xml16
-rw-r--r--eclass/ChangeLog95
-rw-r--r--eclass/meson.eclass309
-rw-r--r--eclass/monotone.eclass11
-rw-r--r--eclass/mv_mozextension-r1.eclass487
-rw-r--r--eclass/mv_mozextension.eclass154
-rw-r--r--eclass/required-use-warn.eclass110
-rw-r--r--games-action/trackballs/Manifest2
-rw-r--r--games-action/trackballs/files/trackballs-1.1.4-warning.patch45
-rw-r--r--games-action/trackballs/trackballs-1.1.4-r1.ebuild78
-rw-r--r--games-board/chessproblem/Manifest2
-rw-r--r--games-board/chessproblem/chessproblem-1.10.ebuild40
-rw-r--r--games-board/chessproblem/chessproblem-2.13.ebuild45
-rw-r--r--games-board/chessproblem/metadata.xml24
-rw-r--r--games-emulation/sdlmame/Manifest1
-rw-r--r--games-emulation/sdlmame/files/sdlmame-0.174-cxx14.patch28
-rw-r--r--games-emulation/sdlmame/files/sdlmame-0.174-qt.patch29
-rw-r--r--games-emulation/sdlmame/files/sdlmame-0.174-sdlSetWindow.patch13
-rw-r--r--games-emulation/sdlmame/files/sdlmame-0.174-string.patch10
-rw-r--r--games-emulation/sdlmame/files/sdlmame-0.174-tostring.patch11
-rw-r--r--games-emulation/sdlmame/files/vector.ini9
-rw-r--r--games-emulation/sdlmame/metadata.xml30
-rw-r--r--games-emulation/sdlmame/sdlmame-0.174-r2.ebuild236
-rw-r--r--games-emulation/xmame/Manifest1
-rw-r--r--games-emulation/xmame/files/fix-zn1-looping-sound.patch83
-rw-r--r--games-emulation/xmame/metadata.xml38
-rw-r--r--games-emulation/xmame/xmame-0.106-r4.ebuild228
-rw-r--r--games-emulation/xmess/Manifest1
-rw-r--r--games-emulation/xmess/files/xmess-0.106-overflow.patch11
-rw-r--r--games-emulation/xmess/metadata.xml38
-rw-r--r--games-emulation/xmess/xmess-0.106-r3.ebuild228
-rw-r--r--games-engines/freesci/Manifest1
-rw-r--r--games-engines/freesci/files/freesci-0.6.4-glibc2.10.patch42
-rw-r--r--games-engines/freesci/files/inline.patch40
-rw-r--r--games-engines/freesci/freesci-0.6.4-r2.ebuild50
-rw-r--r--games-rpg/aklabeth/Manifest1
-rw-r--r--games-rpg/aklabeth/aklabeth-1.0-r1.ebuild26
-rw-r--r--games-rpg/aklabeth/files/aklabeth-1.0-gcc43.patch10
-rw-r--r--games-rpg/dsa-stats/Manifest1
-rw-r--r--games-rpg/dsa-stats/dsa-stats-1.1.ebuild19
-rw-r--r--games-rpg/dsa-stats/metadata.xml16
-rw-r--r--games-rpg/freedroidrpg/Manifest1
-rw-r--r--games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch49
-rw-r--r--games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild102
-rw-r--r--games-rpg/freedroidrpg/metadata.xml34
-rw-r--r--games-rpg/m5figur-mv/ChangeLog41
-rw-r--r--games-rpg/m5figur-mv/Manifest2
-rw-r--r--games-rpg/m5figur-mv/m5figur-mv-2.4.ebuild (renamed from games-rpg/m5figur-mv/m5figur-mv-4.2.2.ebuild)26
-rw-r--r--games-rpg/m5figur-mv/metadata.xml2
-rw-r--r--games-rpg/magus/ChangeLog141
-rw-r--r--games-rpg/magus/Manifest2
-rw-r--r--games-rpg/magus/magus-1.3.1.ebuild268
-rw-r--r--games-rpg/magus/magus-1.3.3.ebuild268
-rw-r--r--games-rpg/magus/magus-99999999.ebuild268
-rw-r--r--games-rpg/magus/metadata.xml31
-rw-r--r--licenses/AgereSystems-WinModem104
-rw-r--r--licenses/FML-1155
-rw-r--r--licenses/GDLS248
-rw-r--r--licenses/epubreader54
-rw-r--r--licenses/googleearth170
-rw-r--r--media-gfx/ipe/Manifest1
-rw-r--r--media-gfx/ipe/ipe-7.2.24.ebuild69
-rw-r--r--media-gfx/ipe/metadata.xml17
-rw-r--r--media-gfx/libspiro/Manifest1
-rw-r--r--media-gfx/libspiro/libspiro-20200505-r1.ebuild22
-rw-r--r--media-gfx/libspiro/metadata.xml8
-rw-r--r--media-gfx/pqiv/ChangeLog18
-rw-r--r--media-gfx/pqiv/Manifest2
-rw-r--r--media-gfx/pqiv/metadata.xml20
-rw-r--r--media-gfx/pqiv/pqiv-2.11.ebuild77
-rw-r--r--media-gfx/pqiv/pqiv-2.2.ebuild49
-rw-r--r--media-libs/avidemux-core/Manifest1
-rw-r--r--media-libs/avidemux-core/avidemux-core-2.7.8.ebuild98
-rw-r--r--media-libs/avidemux-core/metadata.xml15
-rw-r--r--media-libs/avidemux-plugins/Manifest1
-rw-r--r--media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild161
-rw-r--r--media-libs/avidemux-plugins/files/avidemux-plugins-2.6.20-optional-pulse.patch20
-rw-r--r--media-libs/avidemux-plugins/metadata.xml23
-rw-r--r--media-tv/nvtv/Manifest1
-rw-r--r--media-tv/nvtv/files/nvtv.start21
-rw-r--r--media-tv/nvtv/files/respect-cflags.patch31
-rw-r--r--media-tv/nvtv/metadata.xml9
-rw-r--r--media-tv/nvtv/nvtv-0.4.7-r3.ebuild45
-rw-r--r--media-tv/sundtek-tv/ChangeLog167
-rw-r--r--media-tv/sundtek-tv/Manifest2
-rw-r--r--media-tv/sundtek-tv/files/_mediaclient201
-rw-r--r--media-tv/sundtek-tv/files/sundtek.initd20
-rw-r--r--media-tv/sundtek-tv/metadata.xml2
-rw-r--r--media-tv/sundtek-tv/sundtek-tv-151002.142741.ebuild (renamed from media-tv/sundtek-tv/sundtek-tv-210407.172308.ebuild)54
-rw-r--r--media-tv/w_scan/Manifest1
-rw-r--r--media-tv/w_scan/files/plp_id.patch14
-rw-r--r--media-tv/w_scan/w_scan-20170107-r1.ebuild36
-rw-r--r--media-video/avidemux/Manifest2
-rw-r--r--media-video/avidemux/avidemux-2.7.8.ebuild138
-rw-r--r--media-video/avidemux/metadata.xml14
-rw-r--r--media-video/avinfo/Manifest2
-rw-r--r--media-video/avinfo/avinfo-1.0_alpha15_p1-r1.ebuild39
-rw-r--r--media-video/avinfo/files/no-bison.patch13
-rw-r--r--media-video/avinfo/files/no-common.patch25
-rw-r--r--media-video/avinfo/metadata.xml8
-rw-r--r--media-video/handbrake/Manifest1
-rw-r--r--media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch27
-rw-r--r--media-video/handbrake/files/handbrake-1.3.3-x265-link.patch13
-rw-r--r--media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch20
-rw-r--r--media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch84
-rw-r--r--media-video/handbrake/handbrake-1.3.3-r1.ebuild167
-rw-r--r--media-video/handbrake/metadata.xml17
-rw-r--r--media-video/video-mv/ChangeLog266
-rw-r--r--media-video/video-mv/Manifest2
-rw-r--r--media-video/video-mv/metadata.xml2
-rw-r--r--media-video/video-mv/video-mv-8.6.ebuild (renamed from media-video/video-mv/video-mv-17.1.ebuild)38
-rw-r--r--metadata/layout.conf6
-rw-r--r--metadata/pkg_desc_index139
-rw-r--r--net-dialup/accounting/ChangeLog26
-rw-r--r--net-dialup/accounting/Manifest2
-rw-r--r--net-dialup/accounting/accounting-1.60.45.3.1.ebuild (renamed from net-dialup/accounting/accounting-1.60.45.3.1-r1.ebuild)13
-rw-r--r--net-dialup/accounting/metadata.xml2
-rw-r--r--net-dialup/martian-modem/ChangeLog45
-rw-r--r--net-dialup/martian-modem/Manifest2
-rw-r--r--net-dialup/martian-modem/files/martian-modem-20100123-linux-3.10.patch69
-rw-r--r--net-dialup/martian-modem/files/martian-modem-20100123-linux-3.8.patch86
-rw-r--r--net-dialup/martian-modem/files/martian-modem-kernel-3.8.patch22
-rw-r--r--net-dialup/martian-modem/files/martian-modem.conf.d3
-rw-r--r--net-dialup/martian-modem/files/martian-modem.init.d4
-rw-r--r--net-dialup/martian-modem/martian-modem-20100123-r2.ebuild (renamed from net-dialup/martian-modem/martian-modem-20100123-r3.ebuild)42
-rw-r--r--net-dialup/martian-modem/metadata.xml13
-rw-r--r--net-dns/host/Manifest1
-rw-r--r--net-dns/host/files/host-20070128-Makefile.patch62
-rw-r--r--net-dns/host/host-20070128-r1.ebuild41
-rw-r--r--net-dns/host/metadata.xml7
-rw-r--r--net-dns/noip-updater/Manifest1
-rw-r--r--net-dns/noip-updater/files/noip-2.1.9-daemon.patch21
-rw-r--r--net-dns/noip-updater/files/noip-2.1.9-flags.patch11
-rw-r--r--net-dns/noip-updater/files/noip.service11
-rw-r--r--net-dns/noip-updater/files/noip2.start34
-rw-r--r--net-dns/noip-updater/metadata.xml24
-rw-r--r--net-dns/noip-updater/noip-updater-2.1.9-r5.ebuild72
-rw-r--r--net-firewall/firewall-mv/ChangeLog169
-rw-r--r--net-firewall/firewall-mv/Manifest2
-rw-r--r--net-firewall/firewall-mv/firewall-mv-13.2.ebuild43
-rw-r--r--net-firewall/firewall-mv/firewall-mv-8.13.ebuild47
-rw-r--r--net-firewall/firewall-mv/metadata.xml2
-rw-r--r--net-misc/netctl/Manifest1
-rw-r--r--net-misc/netctl/metadata.xml5
-rw-r--r--net-misc/netctl/netctl-1.11.ebuild63
-rw-r--r--net-misc/openrdate/Manifest1
-rw-r--r--net-misc/openrdate/files/openrdate-1.1.3-rename.patch29
-rw-r--r--net-misc/openrdate/files/openrdate-confd12
-rw-r--r--net-misc/openrdate/files/openrdate-initd26
-rw-r--r--net-misc/openrdate/files/sysctl.patch12
-rw-r--r--net-misc/openrdate/metadata.xml10
-rw-r--r--net-misc/openrdate/openrdate-1.2.ebuild39
-rw-r--r--net-misc/sshstart/ChangeLog83
-rw-r--r--net-misc/sshstart/Manifest2
-rw-r--r--net-misc/sshstart/metadata.xml5
-rw-r--r--net-misc/sshstart/sshstart-2.15.ebuild31
-rw-r--r--net-misc/sshstart/sshstart-4.10.ebuild41
-rw-r--r--net-print/foo2zjs/ChangeLog30
-rw-r--r--net-print/foo2zjs/Manifest20
-rw-r--r--net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch145
-rw-r--r--net-print/foo2zjs/files/foo2zjs-20081129-udevfwld.patch273
-rw-r--r--net-print/foo2zjs/files/foreground.patch18
-rw-r--r--net-print/foo2zjs/files/udev.patch11
-rw-r--r--net-print/foo2zjs/files/usbbackend.patch11
-rw-r--r--net-print/foo2zjs/foo2zjs-20081129-r1.ebuild128
-rw-r--r--net-print/foo2zjs/foo2zjs-20200221.ebuild78
-rw-r--r--net-print/foo2zjs/metadata.xml18
-rw-r--r--profiles/make.defaults2
-rw-r--r--profiles/package.mask48
-rw-r--r--profiles/use.desc9
-rw-r--r--profiles/use.local.desc284
-rw-r--r--repositories.xml21
-rw-r--r--sci-geosciences/googleearth/Manifest6
-rw-r--r--sci-geosciences/googleearth/files/googleearth-7-pro-desktopfile.patch17
-rw-r--r--sci-geosciences/googleearth/files/googleearth-mimetypes.xml21
-rw-r--r--sci-geosciences/googleearth/googleearth-7.1.8.3036-r3.ebuild161
-rw-r--r--sci-geosciences/googleearth/googleearth-7.3.0.3832-r3.ebuild169
-rw-r--r--sci-geosciences/googleearth/googleearth-7.3.2.ebuild156
-rw-r--r--sci-geosciences/googleearth/googleearth-7.3.3.ebuild156
-rw-r--r--sci-geosciences/googleearth/metadata.xml12
-rw-r--r--sci-mathematics/genius/ChangeLog12
-rw-r--r--sci-mathematics/genius/Manifest4
-rw-r--r--sci-mathematics/genius/genius-1.0.19.ebuild65
-rw-r--r--sci-mathematics/genius/genius-1.0.21.ebuild74
-rw-r--r--sci-mathematics/genius/metadata.xml38
-rw-r--r--sci-mathematics/reduce/ChangeLog13
-rw-r--r--sci-mathematics/reduce/Manifest3
-rwxr-xr-x[-rw-r--r--]sci-mathematics/reduce/files/csl2
-rwxr-xr-x[-rw-r--r--]sci-mathematics/reduce/files/redcsl2
-rw-r--r--sci-mathematics/reduce/metadata.xml23
-rw-r--r--sci-mathematics/reduce/reduce-20141130-r1.ebuild (renamed from sci-mathematics/reduce/reduce-20141130-r3.ebuild)21
-rw-r--r--sci-mathematics/reduce/reduce-20190413.ebuild110
-rw-r--r--sys-apps/cpi/ChangeLog107
-rw-r--r--sys-apps/cpi/Manifest2
-rw-r--r--sys-apps/cpi/cpi-2.10.ebuild (renamed from sys-apps/cpi/cpi-3.2.ebuild)10
-rw-r--r--sys-apps/cpi/metadata.xml2
-rw-r--r--sys-apps/less/ChangeLog240
-rw-r--r--sys-apps/less/Manifest5
-rw-r--r--sys-apps/less/files/README.Gentoo22
-rw-r--r--sys-apps/less/files/code2color-0.2.patch26
-rw-r--r--sys-apps/less/files/lesspipe.sh (renamed from sys-apps/less/files/lesspipe-r1.sh)61
-rw-r--r--sys-apps/less/less-481.ebuild (renamed from sys-apps/less/less-590.ebuild)70
-rw-r--r--sys-apps/less/metadata.xml10
-rw-r--r--sys-apps/lesspipe/ChangeLog27
-rw-r--r--sys-apps/lesspipe/Manifest1
-rw-r--r--sys-apps/lesspipe/lesspipe-1.83.ebuild211
-rw-r--r--sys-apps/lesspipe/metadata.xml (renamed from app-text/lesspipe/metadata.xml)16
-rw-r--r--sys-apps/man/Manifest1
-rw-r--r--sys-apps/man/files/makewhatis.cron5
-rw-r--r--sys-apps/man/files/man-1.5m2-apropos.patch16
-rw-r--r--sys-apps/man/files/man-1.6-cross-compile.patch61
-rw-r--r--sys-apps/man/files/man-1.6c-cut-duplicate-manpaths.patch83
-rw-r--r--sys-apps/man/files/man-1.6e-headers.patch13
-rw-r--r--sys-apps/man/files/man-1.6f-makewhatis-compression-cleanup.patch69
-rw-r--r--sys-apps/man/files/man-1.6f-man2html-compression-2.patch61
-rw-r--r--sys-apps/man/files/man-1.6f-parallel-build.patch78
-rw-r--r--sys-apps/man/files/man-1.6f-so-search-2.patch34
-rw-r--r--sys-apps/man/files/man-1.6f-unicode.patch28
-rw-r--r--sys-apps/man/files/man-1.6g-compress.patch17
-rw-r--r--sys-apps/man/files/man-1.6g-echo-escape.patch15
-rw-r--r--sys-apps/man/files/man-1.6g-fbsd.patch15
-rw-r--r--sys-apps/man/files/man-1.6g-gawk-5.patch11
-rw-r--r--sys-apps/man/files/man-1.6g-xz.patch53
-rw-r--r--sys-apps/man/man-1.6g-r3.ebuild150
-rw-r--r--sys-apps/man/metadata.xml11
-rw-r--r--sys-apps/openrc-wrapper/ChangeLog53
-rw-r--r--sys-apps/openrc-wrapper/Manifest2
-rw-r--r--sys-apps/openrc-wrapper/metadata.xml2
-rw-r--r--sys-apps/openrc-wrapper/openrc-wrapper-1.7.ebuild (renamed from sys-apps/openrc-wrapper/openrc-wrapper-2.4.ebuild)23
-rw-r--r--sys-apps/paxopen/Manifest1
-rw-r--r--sys-apps/paxopen/metadata.xml16
-rw-r--r--sys-apps/paxopen/paxopen-1.2.ebuild20
-rw-r--r--sys-apps/schedule/ChangeLog230
-rw-r--r--sys-apps/schedule/Manifest2
-rw-r--r--sys-apps/schedule/metadata.xml2
-rw-r--r--sys-apps/schedule/schedule-7.2.0.ebuild (renamed from sys-apps/schedule/schedule-8.0.1.ebuild)32
-rw-r--r--sys-apps/starter/ChangeLog99
-rw-r--r--sys-apps/starter/Manifest2
-rw-r--r--sys-apps/starter/metadata.xml2
-rw-r--r--sys-apps/starter/starter-2.15.ebuild (renamed from sys-apps/starter/starter-3.0.ebuild)14
-rw-r--r--sys-block/parted/Manifest1
-rw-r--r--sys-block/parted/files/parted-2.4-glibc-2.28.patch114
-rw-r--r--sys-block/parted/files/parted-2.4-no-gets.patch10
-rw-r--r--sys-block/parted/files/parted-2.4-readline.patch11
-rw-r--r--sys-block/parted/files/parted-3.2-sysmacros.patch28
-rw-r--r--sys-block/parted/metadata.xml31
-rw-r--r--sys-block/parted/parted-2.4-r3.ebuild83
-rw-r--r--sys-block/zram-init/ChangeLog107
-rw-r--r--sys-block/zram-init/Manifest2
-rw-r--r--sys-block/zram-init/metadata.xml7
-rw-r--r--sys-block/zram-init/zram-init-11.0.ebuild67
-rw-r--r--sys-block/zram-init/zram-init-3.4.ebuild43
-rw-r--r--sys-boot/grub-cfg-mv/Manifest1
-rw-r--r--sys-boot/grub-cfg-mv/grub-cfg-mv-1.8.ebuild21
-rw-r--r--sys-boot/grub-cfg-mv/metadata.xml16
-rw-r--r--sys-fs/aufs-util/ChangeLog36
-rw-r--r--sys-fs/aufs-util/aufs-util-99999999.ebuild42
-rw-r--r--sys-fs/aufs-util/metadata.xml (renamed from app-arch/paq8l/metadata.xml)2
-rw-r--r--sys-fs/aufs/ChangeLog84
-rw-r--r--sys-fs/aufs/aufs-99999999.ebuild200
-rw-r--r--sys-fs/aufs/files/grsecurity-2.2.0.patch61
-rw-r--r--sys-fs/aufs/files/grsecurity-2.2.1.patch63
-rw-r--r--sys-fs/aufs/files/grsecurity-2.2.2.patch61
-rw-r--r--sys-fs/aufs/files/grsecurity-2.2.2.r1.patch15
-rw-r--r--sys-fs/aufs/files/grsecurity-2.9.1.patch15
-rw-r--r--sys-fs/aufs/metadata.xml (renamed from media-tv/w_scan/metadata.xml)5
-rw-r--r--sys-fs/emount/ChangeLog79
-rw-r--r--sys-fs/emount/Manifest2
-rw-r--r--sys-fs/emount/emount-2.8.3.ebuild (renamed from sys-fs/emount/emount-3.0.5.ebuild)21
-rw-r--r--sys-fs/emount/metadata.xml2
-rw-r--r--sys-fs/squash_dir/ChangeLog348
-rw-r--r--sys-fs/squash_dir/Manifest2
-rw-r--r--sys-fs/squash_dir/metadata.xml2
-rw-r--r--sys-fs/squash_dir/squash_dir-13.8.ebuild (renamed from sys-fs/squash_dir/squash_dir-13.14-r1.ebuild)40
-rw-r--r--sys-fs/squashfs-tools/ChangeLog55
-rw-r--r--sys-fs/squashfs-tools/Manifest3
-rw-r--r--sys-fs/squashfs-tools/files/squashfs-tools-4.3-quiet.patch56
-rw-r--r--sys-fs/squashfs-tools/metadata.xml16
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild62
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-4.5_alpha20210318.ebuild93
-rw-r--r--sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild93
-rw-r--r--sys-fs/squashfuse/Manifest1
-rw-r--r--sys-fs/squashfuse/metadata.xml23
-rw-r--r--sys-fs/squashfuse/squashfuse-0.1.104.ebuild56
-rw-r--r--sys-fs/squashmount/ChangeLog376
-rw-r--r--sys-fs/squashmount/Manifest2
-rw-r--r--sys-fs/squashmount/metadata.xml2
-rw-r--r--sys-fs/squashmount/squashmount-12.2.0.ebuild (renamed from sys-fs/squashmount/squashmount-22.1.ebuild)56
-rw-r--r--sys-kernel/kccmp/Manifest1
-rw-r--r--sys-kernel/kccmp/kccmp-0.3-r2.ebuild33
-rw-r--r--sys-kernel/kccmp/metadata.xml16
-rw-r--r--sys-kernel/kconfig-hardened-check/Manifest1
-rw-r--r--sys-kernel/kconfig-hardened-check/kconfig-hardened-check-0.5.9.ebuild35
-rw-r--r--sys-kernel/kconfig-hardened-check/kconfig-hardened-check-99999999.ebuild35
-rw-r--r--sys-kernel/kernel/ChangeLog181
-rw-r--r--sys-kernel/kernel/Manifest2
-rw-r--r--sys-kernel/kernel/kernel-1.39.ebuild40
-rw-r--r--sys-kernel/kernel/kernel-6.3.ebuild43
-rw-r--r--sys-kernel/kernel/metadata.xml2
-rw-r--r--sys-power/cpupower/cpupower-99999999.ebuild75
-rw-r--r--sys-power/cpupower/files/conf.d-r236
-rw-r--r--sys-power/cpupower/files/cpupower-5.4-cflags.patch32
-rw-r--r--sys-power/cpupower/files/cpupower-frequency-set.service9
-rw-r--r--sys-power/cpupower/files/cpupower-frequency-set.service.conf2
-rw-r--r--sys-power/cpupower/files/init.d-r441
-rw-r--r--sys-power/cpupower/metadata.xml11
-rw-r--r--virtual/cdrtools/cdrtools-1.ebuild14
-rw-r--r--virtual/cdrtools/metadata.xml8
-rw-r--r--virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r4.ebuild27
-rw-r--r--virtual/freedesktop-icon-theme/metadata.xml7
-rw-r--r--virtual/man/man-0-r4.ebuild21
-rw-r--r--virtual/man/metadata.xml8
-rw-r--r--www-plugins/bookmark-dupes/Manifest1
-rw-r--r--www-plugins/bookmark-dupes/bookmark-dupes-6.4.ebuild18
-rw-r--r--www-plugins/bookmark-dupes/metadata.xml8
-rw-r--r--www-plugins/calc-extension/Manifest1
-rw-r--r--www-plugins/calc-extension/calc-extension-5.3.ebuild18
-rw-r--r--www-plugins/calc-extension/metadata.xml8
-rw-r--r--www-plugins/canvasblocker/Manifest1
-rw-r--r--www-plugins/canvasblocker/canvasblocker-0.5.5.ebuild18
-rw-r--r--www-plugins/canvasblocker/metadata.xml8
-rw-r--r--www-plugins/classic-theme-restorer/ChangeLog93
-rw-r--r--www-plugins/classic-theme-restorer/Manifest1
-rw-r--r--www-plugins/classic-theme-restorer/classic-theme-restorer-1.4.0.ebuild18
-rw-r--r--www-plugins/classic-theme-restorer/metadata.xml (renamed from games-engines/freesci/metadata.xml)2
-rw-r--r--www-plugins/dark-mode/Manifest1
-rw-r--r--www-plugins/dark-mode/dark-mode-0.3.7.ebuild17
-rw-r--r--www-plugins/dark-mode/metadata.xml8
-rw-r--r--www-plugins/decentraleyes/Manifest1
-rw-r--r--www-plugins/decentraleyes/decentraleyes-2.0.8.ebuild18
-rw-r--r--www-plugins/decentraleyes/metadata.xml8
-rw-r--r--www-plugins/duckduckgo/ChangeLog106
-rw-r--r--www-plugins/duckduckgo/Manifest2
-rw-r--r--www-plugins/duckduckgo/duckduckgo-0.4.6-r1.ebuild18
-rw-r--r--www-plugins/duckduckgo/duckduckgo-2018.10.24.ebuild18
-rw-r--r--www-plugins/duckduckgo/metadata.xml2
-rw-r--r--www-plugins/epubreader/ChangeLog46
-rw-r--r--www-plugins/epubreader/Manifest2
-rw-r--r--www-plugins/epubreader/epubreader-1.5.0.6-r1.ebuild16
-rw-r--r--www-plugins/epubreader/epubreader-2.0.13.ebuild17
-rw-r--r--www-plugins/epubreader/metadata.xml2
-rw-r--r--www-plugins/form-history-control/ChangeLog126
-rw-r--r--www-plugins/form-history-control/Manifest2
-rw-r--r--www-plugins/form-history-control/form-history-control-1.4.0.4-r1.ebuild19
-rw-r--r--www-plugins/form-history-control/form-history-control-2.5.1.0.ebuild17
-rw-r--r--www-plugins/form-history-control/metadata.xml2
-rw-r--r--www-plugins/google-translation/Manifest1
-rw-r--r--www-plugins/google-translation/google-translation-2.6.ebuild19
-rw-r--r--www-plugins/google-translation/metadata.xml8
-rw-r--r--www-plugins/google-translator-for-firefox/Manifest1
-rw-r--r--www-plugins/google-translator-for-firefox/google-translator-for-firefox-3.0.3.3.ebuild18
-rw-r--r--www-plugins/google-translator-for-firefox/metadata.xml8
-rw-r--r--www-plugins/https-everywhere/Manifest1
-rw-r--r--www-plugins/https-everywhere/https-everywhere-2018.10.31.ebuild17
-rw-r--r--www-plugins/https-everywhere/metadata.xml8
-rw-r--r--www-plugins/locale-switcher/ChangeLog16
-rw-r--r--www-plugins/locale-switcher/Manifest1
-rw-r--r--www-plugins/locale-switcher/locale-switcher-3-r1.ebuild18
-rw-r--r--www-plugins/locale-switcher/metadata.xml (renamed from games-rpg/aklabeth/metadata.xml)2
-rw-r--r--www-plugins/no-color/Manifest1
-rw-r--r--www-plugins/no-color/metadata.xml8
-rw-r--r--www-plugins/no-color/no-color-0.9.4.ebuild17
-rw-r--r--www-plugins/noscript/ChangeLog273
-rw-r--r--www-plugins/noscript/Manifest2
-rw-r--r--www-plugins/noscript/metadata.xml2
-rw-r--r--www-plugins/noscript/noscript-11.0.36.ebuild18
-rw-r--r--www-plugins/noscript/noscript-2.6.9.37.ebuild20
-rw-r--r--www-plugins/requestpolicy/ChangeLog31
-rw-r--r--www-plugins/requestpolicy/Manifest1
-rw-r--r--www-plugins/requestpolicy/metadata.xml8
-rw-r--r--www-plugins/requestpolicy/requestpolicy-0.5.28-r1.ebuild16
-rw-r--r--www-plugins/shumway/ChangeLog23
-rw-r--r--www-plugins/shumway/Manifest1
-rw-r--r--www-plugins/shumway/metadata.xml8
-rw-r--r--www-plugins/shumway/shumway-0.11.394.ebuild18
-rw-r--r--www-plugins/skip-redirect/Manifest1
-rw-r--r--www-plugins/skip-redirect/metadata.xml8
-rw-r--r--www-plugins/skip-redirect/skip-redirect-2.2.1.ebuild18
-rw-r--r--www-plugins/stylish/ChangeLog152
-rw-r--r--www-plugins/stylish/Manifest1
-rw-r--r--www-plugins/stylish/metadata.xml8
-rw-r--r--www-plugins/stylish/stylish-2.0.2-r1.ebuild33
-rw-r--r--www-plugins/translate-to-me/Manifest1
-rw-r--r--www-plugins/translate-to-me/metadata.xml8
-rw-r--r--www-plugins/translate-to-me/translate-to-me-1.1.ebuild19
-rw-r--r--www-plugins/ublock-origin/Manifest1
-rw-r--r--www-plugins/ublock-origin/metadata.xml8
-rw-r--r--www-plugins/ublock-origin/ublock-origin-1.17.2.ebuild17
-rw-r--r--www-plugins/xclear/ChangeLog50
-rw-r--r--www-plugins/xclear/Manifest1
-rw-r--r--www-plugins/xclear/metadata.xml8
-rw-r--r--www-plugins/xclear/xclear-1.8-r2.ebuild16
-rw-r--r--x11-drivers/nvidia-drivers/ChangeLog11
-rw-r--r--x11-drivers/nvidia-drivers/Manifest3
-rw-r--r--x11-drivers/nvidia-drivers/files/173.14.39-grsecurity.patch47
-rw-r--r--x11-drivers/nvidia-drivers/files/173.14.39-kernel-3.13.patch12
-rw-r--r--x11-drivers/nvidia-drivers/files/173.14.39-kernel-3.14.patch12
-rw-r--r--x11-drivers/nvidia-drivers/files/173.14.39-kernel-3.17.patch56
-rw-r--r--x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch11
-rw-r--r--x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch13
-rw-r--r--x11-drivers/nvidia-drivers/files/nvidia-169.0714
-rw-r--r--x11-drivers/nvidia-drivers/metadata.xml14
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild568
-rw-r--r--x11-libs/gtk+/Manifest2
-rw-r--r--x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch33
-rw-r--r--x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch42
-rw-r--r--x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch78
-rw-r--r--x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch12
-rw-r--r--x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch57
-rw-r--r--x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch121
-rw-r--r--x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch21
-rw-r--r--x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch16
-rw-r--r--x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch25
-rw-r--r--x11-libs/gtk+/files/settings.ini4
-rw-r--r--x11-libs/gtk+/gtk+-2.24.33.ebuild324
-rw-r--r--x11-libs/gtk+/gtk+-3.24.29.ebuild265
-rw-r--r--x11-libs/gtk+/metadata.xml29
-rw-r--r--x11-libs/motif/Manifest2
-rw-r--r--x11-libs/motif/files/Mwm.defaults14
-rw-r--r--x11-libs/motif/metadata.xml13
-rw-r--r--x11-libs/motif/motif-2.3.8-r1.ebuild115
-rw-r--r--x11-themes/fvwm-crystal/ChangeLog37
-rw-r--r--x11-themes/fvwm-crystal/Manifest2
-rw-r--r--x11-themes/fvwm-crystal/fvwm-crystal-3.3.2-r1.ebuild64
-rw-r--r--x11-themes/fvwm-crystal/fvwm-crystal-3.6.5.ebuild82
-rw-r--r--x11-themes/fvwm-crystal/metadata.xml18
718 files changed, 13391 insertions, 16461 deletions
diff --git a/.gitignore b/.gitignore
index 16b8e700..97004e0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-/metadata/*
-!/metadata/layout.conf
-!/metadata/pkg_desc_index
-ChangeLog
-!/eclass/ChangeLog
+/metadata/md5-cache/
diff --git a/app-admin/checksec/ChangeLog b/app-admin/checksec/ChangeLog
new file mode 100644
index 00000000..3641c43a
--- /dev/null
+++ b/app-admin/checksec/ChangeLog
@@ -0,0 +1,20 @@
+# ChangeLog for app-admin/checksec
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*checksec-1.5 (12 Feb 2012)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 12 Feb 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch.
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
new file mode 100644
index 00000000..58624369
--- /dev/null
+++ b/app-admin/checksec/Manifest
@@ -0,0 +1 @@
+DIST checksec-1.5.sh 27095 SHA256 77b8a7fd9393d10def665658a41176ee745d5c7969a4a0f43cefcc8a4cd90947 SHA512 de72caf32c9c3b53384b34b16ea86b29dad42ce7c8db5c769166dc43bcfdde91790e99f268d30151512c89550af6e7b19701d9561081cfa92bb7aeacd2306d04 WHIRLPOOL f1ec49650b4c4ce9ba835ec131b30a3ef6c5af1d3c85fc1274442d0a3310491235ce0ff479fce53e60330cbdc710b91852a1290d4e1e04c74fb410352d5f8e25
diff --git a/app-admin/checksec/checksec-1.5.ebuild b/app-admin/checksec/checksec-1.5.ebuild
new file mode 100644
index 00000000..45c465f9
--- /dev/null
+++ b/app-admin/checksec/checksec-1.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils
+
+DESCRIPTION="Check for hardened protections like RELRO, NoExec, Stack protection, ASLR, PIE"
+HOMEPAGE="http://www.trapkit.de/tools/checksec.html"
+SRC_URI="http://www.trapkit.de/tools/${PN}.sh -> ${P}.sh"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+src_prepare() {
+ epatch_user
+}
+
+src_install() {
+ newbin "${DISTDIR}/${P}.sh" "${PN}"
+ insinto /usr/share/zsh/site-functions
+ doins "${FILESDIR}/_${PN}"
+}
diff --git a/app-admin/checksec/files/_checksec b/app-admin/checksec/files/_checksec
new file mode 100644
index 00000000..b30e0160
--- /dev/null
+++ b/app-admin/checksec/files/_checksec
@@ -0,0 +1,18 @@
+#compdef checksec
+_checksec_procname() {
+ compadd "$expl[@]" ${${${${(f)"$(_call_program processes-names ps ${${EUID/(#s)0(#e)/xa}//[0-9]#/}ho command 2> /dev/null)"//[][\(\)]/}:#(ps|COMMAND|-*)}%%\ *}:t}
+}
+_arguments : \
+'--help[print help]' \
+'--version[print version]' \
+'--file[FILE (check FILE)]:file to check:_files' \
+'--fortify-file[FILE (check FILE for fortify)]:file for fortify:_files' \
+'--fortify-proc[ID (check ID'\''s process for fortify)]:process ID for fortify: _pids' \
+'--proc[NAME (check process NAME)]:process name:_checksec_procname' \
+'--proc-all[check all procname]' \
+'--proc-libs[ID (check ID'\''s process libs)]:process ID to check: _pids' \
+'--kernel[check kernel]' \
+'--dir[DIR \[-v\] (check DIR)]:dir:_files -/'
+local stat=$?
+unset -f _checksec_procname
+return stat
diff --git a/games-action/trackballs/metadata.xml b/app-admin/checksec/metadata.xml
index b919c846..73a6d343 100644
--- a/games-action/trackballs/metadata.xml
+++ b/app-admin/checksec/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-admin/flexlm/Manifest b/app-admin/flexlm/Manifest
deleted file mode 100644
index df85514a..00000000
--- a/app-admin/flexlm/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST flexusr.pdf 763798 SHA512 93e34e7940a678f6f97854393de8c07a15c0ee6b2efec5edc792f25b1910990309fa75a59e8f8dc957d9bc4af3b9758d4b7d316c5d5b5e8ce4e4893579b84a10
-DIST lmgrd-amd64.Z 327568 SHA512 382c581395acd39bb2d05a09073b4f70efa7699e3c05e486d4cf6ba22faef13ff37ba524acd4bda90e7f56bc06dcf7bbe5ed7c2363aef4fde9cc6f875bbb92aa
-DIST lmgrd-x86.Z 318617 SHA512 5030de6eb91dc16aaa3d22b8d14fe892b10b1a5573073c8daf498ab8998de5692acb8442f186cfc11e93b178aff8c0cdbcb4ba82b9cd197f96bad19eb7efb993
-DIST lmutil-amd64.Z 331103 SHA512 9ce2613bf7f8c28e5c6316a111ef310b2e79828f8c7299199bf336c531ca011f04b8cd9c294489547eeb29e25b3393df3175875ee01239ece8b268300ed51116
-DIST lmutil-x86.Z 324583 SHA512 6b213da65c59ecef15409144fa97c0a16bb96690acc09bd3919c0db8e922c7e63def915a59e18b017705bc5d91fb77227612ea1eabdb9dc5a038a4a264489acc
diff --git a/app-admin/flexlm/files/90flexlm b/app-admin/flexlm/files/90flexlm
deleted file mode 100644
index a60cf322..00000000
--- a/app-admin/flexlm/files/90flexlm
+++ /dev/null
@@ -1,3 +0,0 @@
-PATH=/opt/flexlm/bin
-ROOTPATH=/opt/flexlm/bin
-MANPATH=/opt/flexlm/man
diff --git a/app-admin/flexlm/files/flexlm-conf b/app-admin/flexlm/files/flexlm-conf
deleted file mode 100644
index 8775dcf1..00000000
--- a/app-admin/flexlm/files/flexlm-conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2012 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Logfile path: (NOTE: This must be uid/gid owned by the value of $LMUSER!)
-LMLOG="/var/log/flexlm/flexlm.log"
-
-# Run the lmgrd user as:
-LMUSER="flexlm"
-
-# List all license files delimeted by a colon
-LMLICENSE="/etc/flexlm/license.dat"
-#LMLICENSE="${LMLICENSE}:/var/flexlm/aw.dat"
-#LMLICENSE="${LMLICENSE}:/opt/shake/keys/license.dat"
diff --git a/app-admin/flexlm/files/flexlm-init b/app-admin/flexlm/files/flexlm-init
deleted file mode 100644
index 1a8bcdf8..00000000
--- a/app-admin/flexlm/files/flexlm-init
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2004 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting lmgrd"
- su - ${LMUSER} -c "umask 022; /opt/flexlm/bin/lmgrd -c '${LMLICENSE}' -l '${LMLOG}'"
- eend $?
-}
-
-stop() {
- ebegin "Stopping lmgrd"
- /opt/flexlm/bin/lmdown -q -all -force -c "${LMLICENSE}" >& /dev/null
- eend $?
-}
diff --git a/app-admin/flexlm/flexlm-9.5-r2.ebuild b/app-admin/flexlm/flexlm-9.5-r2.ebuild
deleted file mode 100644
index e14ddd58..00000000
--- a/app-admin/flexlm/flexlm-9.5-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="fetch"
-inherit user
-
-DESCRIPTION="Macrovision FLEXlm license manager and utils"
-HOMEPAGE="http://www.macrovision.com/services/support/flexlm/lmgrd.shtml"
-# doc ? ( http://www.macrovision.com/services/support/flexlm/enduser.pdf -> flexusr.pdf )
-SRC_URI="doc? ( http://www.ni.com/pdf/manuals/flexusr.pdf )
- x86? (
- mirror://gentoo/lmgrd-x86.Z
- mirror://gentoo/lmutil-x86.Z
- )
- amd64? (
- mirror://gentoo/lmgrd-amd64.Z
- mirror://gentoo/lmutil-amd64.Z
- )"
-
-LICENSE="all-rights-reserved GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-QA_PREBUILT="
- opt/flexlm/bin/lmgrd
- opt/flexlm/bin/lmutil"
-
-S="${WORKDIR}"
-
-src_prepare() {
- mv lmutil-* lmutil || die
- mv lmgrd-* lmgrd || die
-}
-
-src_install () {
- # executables
- exeinto /opt/flexlm/bin
- doexe lmgrd lmutil
-
- dosym lmutil /opt/flexlm/bin/lmcksum
- dosym lmutil /opt/flexlm/bin/lmdiag
- dosym lmutil /opt/flexlm/bin/lmdown
- dosym lmutil /opt/flexlm/bin/lmhostid
- dosym lmutil /opt/flexlm/bin/lmremove
- dosym lmutil /opt/flexlm/bin/lmreread
- dosym lmutil /opt/flexlm/bin/lmstat
- dosym lmutil /opt/flexlm/bin/lmver
-
- # documentation
- use doc && dodoc "${DISTDIR}"/enduser.pdf
-
- # init files
- newinitd "${FILESDIR}"/flexlm-init flexlm
- newconfd "${FILESDIR}"/flexlm-conf flexlm
-
- # environment
- doenvd "${FILESDIR}"/90flexlm
-
- # empty dir for licenses
- keepdir /etc/flexlm
-
- # log dir
- dodir /var/log/flexlm
-}
-
-pkg_postinst() {
- enewgroup flexlm
- enewuser flexlm -1 /bin/bash /opt/flexlm flexlm
-
- # See bug 383787
- chown flexlm /var/log/flexlm || eerror "'chown flexlm /var/log/flexlm' failed!"
-
- elog "FlexLM installed. Config is in /etc/conf.d/flexlm"
- elog "Default location for license file is /etc/flexlm/license.dat"
-}
diff --git a/app-admin/flexlm/metadata.xml b/app-admin/flexlm/metadata.xml
deleted file mode 100644
index 0b92062f..00000000
--- a/app-admin/flexlm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <longdescription>Macrovision FLEXlm license manager and utils</longdescription>
-</pkgmetadata>
diff --git a/app-admin/sudox/ChangeLog b/app-admin/sudox/ChangeLog
new file mode 100644
index 00000000..d68faa4b
--- /dev/null
+++ b/app-admin/sudox/ChangeLog
@@ -0,0 +1,99 @@
+# ChangeLog for app-admin/sudox
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*sudox-3.20 (14 Jul 2015)
+
+ 14 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sudox-3.19 (12 Jul 2015)
+
+ 12 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sudox-3.18 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sudox-3.17 (29 Jul 2014)
+
+ 29 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sudox-3.15 (30 Mar 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 30 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sudox-3.14 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sudox-3.13 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sudox-3.12 (14 Sep 2012)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 14 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sudox-3.11 (14 Aug 2012)
+
+ 14 Aug 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sudox-3.10 (07 May 2012)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sudox-3.8 (04 May 2012)
+
+ 04 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sudox-3.7 (10 Apr 2012)
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 10 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sudox-3.6 (08 Apr 2012)
+
+ 08 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sudox-3.5 (28 Feb 2012)
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sudox-3.4 (26 Dec 2011)
+
+ 26 Dec 2011; Martin Väth <martin@mvath.de>:
+ Add app-admin/sudo to RDEPEND
+
+ 19 Dec 2011; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch.
diff --git a/app-admin/sudox/Manifest b/app-admin/sudox/Manifest
index 47dae640..d7fa1dd5 100644
--- a/app-admin/sudox/Manifest
+++ b/app-admin/sudox/Manifest
@@ -1 +1 @@
-DIST sudox-10.0.tar.gz 15397 SHA512 3981fcbf08d85be38eae1171c64735791979ebb000910a4b5c74ef22cf2427dc0a5eb9be332ca6d86c669e0d3796985cecfbc3e183a7b67fa1642b25fb2fe054
+DIST sudox-3.20.tar.gz 5062 SHA256 e9df824fdf9a26983478bffd708d01f9b7ab2a9ec69111541fce2835b51707c6 SHA512 e99a80a53a5562a802bd5a3520eb37d522ad57d602b9839e13ddc0bf0239abc79427c0addf5c7a6b44f76080ce5774690b41e734f57ecdcb949ca003021918c2 WHIRLPOOL 4b8326ba0330c9cfcdd7285f78f14a92218ad43f33d46a8cee8df74479d945a9318675888b34b729b864eefb6844c72cdc2322c8da967ba615e4517495be0b34
diff --git a/app-admin/sudox/metadata.xml b/app-admin/sudox/metadata.xml
index 04177d16..ec851a13 100644
--- a/app-admin/sudox/metadata.xml
+++ b/app-admin/sudox/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-admin/sudox/sudox-10.0.ebuild b/app-admin/sudox/sudox-10.0.ebuild
deleted file mode 100644
index 3451d4da..00000000
--- a/app-admin/sudox/sudox-10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2011-2021 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="wrapper for sudo which can pass X authority data and deal with screen and tmux"
-HOMEPAGE="https://github.com/vaeth/sudox/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-RDEPEND="app-admin/sudo
- >=app-shells/push-2.0-r2"
-DEPEND=""
-
-src_prepare() {
- use prefix || sed -i \
- -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}"'/bin/sh"' \
- -- bin/* || die
- default
-}
-
-src_install() {
- dodoc README.md ChangeLog
- newdoc sudoers.d/${PN} sudoers.d
- dobin bin/*
- insinto /usr/share/zsh/site-functions
- doins zsh/*
- insinto /usr/share/wayland-sessions
- doins usr/share/wayland-sessions/*
-}
diff --git a/app-admin/sudox/sudox-3.20.ebuild b/app-admin/sudox/sudox-3.20.ebuild
new file mode 100644
index 00000000..e923996a
--- /dev/null
+++ b/app-admin/sudox/sudox-3.20.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils
+
+DESCRIPTION="sudox is a wrapper for sudo which can pass X authority data and deal with screen and tmux"
+HOMEPAGE="https://github.com/vaeth/sudox/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="app-admin/sudo
+ app-shells/push"
+DEPEND=""
+
+src_prepare() {
+ epatch_user
+}
+
+src_install() {
+ dobin "${PN}"
+ insinto /usr/share/zsh/site-functions
+ doins "_${PN}"
+}
diff --git a/app-arch/archwrap/ChangeLog b/app-arch/archwrap/ChangeLog
new file mode 100644
index 00000000..506728fc
--- /dev/null
+++ b/app-arch/archwrap/ChangeLog
@@ -0,0 +1,162 @@
+# ChangeLog for app-arch/archwrap
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*archwrap-1.26 (21 Jul 2015)
+
+ 21 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.25 (18 Jul 2015)
+
+ 18 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.24 (12 Jul 2015)
+
+ 12 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.23 (27 Jun 2015)
+
+ 27 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support -v/-q
+
+*archwrap-1.22 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.21 (29 May 2015)
+
+ 29 May 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.20 (10 May 2015)
+
+ 10 May 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.19 (29 May 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 29 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.18 (14 Apr 2014)
+
+ 14 Apr 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.17 (30 Mar 2014)
+
+ 30 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.16 (20 Feb 2014)
+
+ 20 Feb 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.15 (13 Jan 2014)
+
+ 13 Jan 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.14 (27 Dec 2013)
+
+ 27 Dec 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.13 (25 Dec 2013)
+
+ 25 Dec 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support xattr
+
+*archwrap-1.12-r3 (18 Dec 2013)
+
+ 18 Dec 2013; Martin Väth <martin@mvath.de>:
+ sed with correct path
+
+*archwrap-1.12-r2 (17 Dec 2013)
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ archwrap.sh -> /usr/share/archwrap: it is not meant to be called by the user
+ Fix sh path
+
+*archwrap-1.12-r1 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix symlink handling
+
+*archwrap-1.11 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Shebang care
+
+*archwrap-1.10 (31 May 2013)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 31 Sep 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix preserve defaults
+
+*archwrap-1.9 (08 May 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 08 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.8 (07 May 2012)
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.7 (04 May 2012)
+
+ 04 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.6 (13 Apr 2012)
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 13 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.5 (08 Apr 2012)
+
+ 08 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.4 (23 Mar 2012)
+
+ 23 Mar 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.3 (28 Feb 2012)
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.2 (31 Jan 2012)
+
+ 31 Jan 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*archwrap-1.1 (29 Jan 2012)
+
+ 29 Jan 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/app-arch/archwrap/Manifest b/app-arch/archwrap/Manifest
index e5d7cf0a..ab9a3642 100644
--- a/app-arch/archwrap/Manifest
+++ b/app-arch/archwrap/Manifest
@@ -1 +1 @@
-DIST archwrap-11.4.tar.gz 18465 SHA512 7bbb0e787ae1cec4cd1e7253a6f13625f0b6f0b0e10720651b40633496f37c122445e498f21b373a161626f2118aa7c137f1f52bcc689606290af9f0c098d902
+DIST archwrap-1.26.tar.gz 14098 SHA256 5bd917af8ad7b8e3c64bbd73919ea84b18f18cfd7e24c4cae342d2f24b2b4012 SHA512 218e97e36273ec5070db53ca3f5ca570d72011a51bd06d0075f394d0e66064fc0e8fa0944856573cfea35681e2d3e32fe2cdd77b164905a775f8181b09abba81 WHIRLPOOL 48c050c6ed9e52ce7082dca935859aafd2aea3a4b47c2b409f4f390b06385460fb1ac989ed655c10aad9546253c5f5b3a667cd146c0c5acd6766b03ad6c6ec51
diff --git a/app-arch/archwrap/archwrap-11.4.ebuild b/app-arch/archwrap/archwrap-1.26.ebuild
index f51b88d7..530af13f 100644
--- a/app-arch/archwrap/archwrap-11.4.ebuild
+++ b/app-arch/archwrap/archwrap-1.26.ebuild
@@ -1,8 +1,10 @@
-# Copyright 2012-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
+inherit eutils
DESCRIPTION="A collection of POSIX shell scripts to invoke archiver programs"
HOMEPAGE="https://github.com/vaeth/archwrap/"
@@ -10,9 +12,9 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND=">=app-shells/push-3 !<app-arch/brotli-1.0.4"
+RDEPEND="app-shells/push"
DEPEND=""
src_prepare() {
@@ -20,10 +22,10 @@ src_prepare() {
use prefix || for i in bin/*
do test -h "${i}" || sed -i \
-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
- -e 's"^\. archwrap\.sh$". '"${EPREFIX}/usr/lib/archwrap/archwrap.sh"'"' \
+ -e 's"^\. archwrap\.sh$". '"${EPREFIX}/usr/share/archwrap/archwrap.sh"'"' \
-- "${i}" || die
done
- default
+ epatch_user
}
src_install() {
@@ -36,9 +38,9 @@ src_install() {
then dobin "${i}"
fi
done
- insinto /usr/lib/archwrap
+ insinto /usr/share/archwrap
doins bin/archwrap.sh
insinto /usr/share/zsh/site-functions
doins zsh/*
- dodoc README.md archwrap_alias
+ dodoc README archwrap_alias
}
diff --git a/app-arch/archwrap/metadata.xml b/app-arch/archwrap/metadata.xml
index b769f544..9f364815 100644
--- a/app-arch/archwrap/metadata.xml
+++ b/app-arch/archwrap/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-arch/bzwc/ChangeLog b/app-arch/bzwc/ChangeLog
new file mode 100644
index 00000000..bb95c65e
--- /dev/null
+++ b/app-arch/bzwc/ChangeLog
@@ -0,0 +1,86 @@
+# ChangeLog for app-arch/bzwc
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*bzwc-2.18 (12 Jul 2015)
+
+ 12 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*bzwc-2.16 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*bzwc-2.15 (30 Mar 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 30 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*bzwc-2.14-r1 (17 Dec 2013)
+
+ 17 Nov 2013; Martin Väth <martin@mvath.de>:
+ Fix sh path
+
+*bzwc-2.14 (21 Nov 2013)
+
+ 12 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*bzwc-2.13 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Shebang care
+
+*bzwc-2.12 (07 May 2012)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*bzwc-2.11 (04 May 2012)
+
+ 04 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*bzwc-2.10 (21 Apr 2012)
+
+ 21 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*bzwc-2.9 (08 Apr 2012)
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 08 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*bzwc-2.8 (28 Feb 2012)
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*bzwc-2.7-r1 (03 Feb 2012)
+
+ 03 Feb 2012; Martin Väth <martin@mvath.de>:
+ Do not install README
+
+*bzwc-2.7 (29 Jan 2012)
+
+ 29 Jan 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/app-arch/bzwc/Manifest b/app-arch/bzwc/Manifest
index f2f12ae5..7df49bcd 100644
--- a/app-arch/bzwc/Manifest
+++ b/app-arch/bzwc/Manifest
@@ -1 +1 @@
-DIST bzwc-5.1.tar.gz 2177 SHA512 6585516b15172eafeca27ad242e560b86507abb27969e427163499c139bc3700f7fa0b94b0a1501b5eb5f8fc2b070784f25e034eb781ff04becffd0f64fff3b3
+DIST bzwc-2.18.tar.gz 1844 SHA256 59091b3e210b1db89c02147f6efa1ab60e1b591978b14dde9fd3ac11c8bf5ffd SHA512 1479dc4576d5c05427bf06fd227a2eac7fba4b8cdd842cca9f4b3457a0baabe30d1fe4d2df1d958ec9d76d43c767b72e3c557f67349a19a90f3c88a26f0281e2 WHIRLPOOL 05b8da3017a7886dc3f9d1e6c2a29d3649bbd2595a9aefc45670001957c73be5fd82a76c8b5c394dd92f503fecfd0528d7c65aca99831fc9e7a7fa5c83852407
diff --git a/app-arch/bzwc/bzwc-5.1.ebuild b/app-arch/bzwc/bzwc-2.18.ebuild
index a192b928..e2227818 100644
--- a/app-arch/bzwc/bzwc-5.1.ebuild
+++ b/app-arch/bzwc/bzwc-2.18.ebuild
@@ -1,8 +1,10 @@
-# Copyright 2012-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
+inherit eutils
DESCRIPTION="A POSIX shell wrapper for wc, supporting compressed files (xz, lzma, bz2, gz)"
HOMEPAGE="https://github.com/vaeth/bzwc/"
@@ -10,9 +12,9 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND=">=app-shells/push-2.0-r2"
+RDEPEND="app-shells/push"
DEPEND=""
src_prepare() {
@@ -22,14 +24,14 @@ src_prepare() {
sed -i -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' -- "${i}" \
|| die
done
- default
+ epatch_user
}
src_install() {
local i
insinto /usr/bin
for i in bin/*
- do if test -h "${i}"
+ do if test -h "${i}" || ! test -x "${i}"
then doins "${i}"
else dobin "${i}"
fi
diff --git a/app-arch/bzwc/metadata.xml b/app-arch/bzwc/metadata.xml
index 02831df1..d8487bbc 100644
--- a/app-arch/bzwc/metadata.xml
+++ b/app-arch/bzwc/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-arch/paq8l/Manifest b/app-arch/paq8l/Manifest
deleted file mode 100644
index 02ee1867..00000000
--- a/app-arch/paq8l/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST paq8l.zip 181334 SHA512 102c7c0895bc458c15ffc39efe79c1a909dbdd49e14276bba1c8d1a4f57988bbc8bf6558c9d4ae4e78303a0f2917547d60b79858ccf63969af2ee4a854eebf44
diff --git a/app-arch/paq8l/paq8l-20070308.ebuild b/app-arch/paq8l/paq8l-20070308.ebuild
deleted file mode 100644
index 14e11f1e..00000000
--- a/app-arch/paq8l/paq8l-20070308.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-inherit toolchain-funcs
-
-DESCRIPTION="Open source file compressor and archiver"
-HOMEPAGE="http://mattmahoney.net/dc/"
-SRC_URI="http://mattmahoney.net/dc/${PN}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-BDEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_compile() {
- $( tc-getCXX ) ${CXXFLAGS} -DNOASM -DUNIX ${PN}.cpp -o ${PN} || die "compile failed"
-}
-
-src_install() {
- dobin ${PN}
- dodoc readme.txt
-}
diff --git a/app-cdr/cdrtools/cdrtools-99999999.ebuild b/app-cdr/cdrtools/cdrtools-99999999.ebuild
deleted file mode 100644
index 209508cb..00000000
--- a/app-cdr/cdrtools/cdrtools-99999999.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Martin V\"ath and others
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="https://sourceforge.net/projects/cdrtools/"
-SRC_URI=""
-
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="schily-tools"
-REQUIRED_USE="schily-tools"
-
-RDEPEND="app-shells/schily-tools[schilytools_cdrtools]"
diff --git a/app-cdr/cdrtools/metadata.xml b/app-cdr/cdrtools/metadata.xml
deleted file mode 100644
index 82226e20..00000000
--- a/app-cdr/cdrtools/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>joerg.schilling@fokus.fraunhofer.de</email>
- <name>Jörg Schilling</name>
- </maintainer>
- <remote-id type="sourceforge">cdrtools</remote-id>
- </upstream>
- <use>
- <flag name="schily-tools">Use libschily from app-shells/schily-tools</flag>
- </use>
- <longdescription>CD and DVD command line recording and ripping tools.</longdescription>
-</pkgmetadata>
diff --git a/app-dicts/ispell-de-alt/Manifest b/app-dicts/ispell-de-alt/Manifest
deleted file mode 100644
index 603129a1..00000000
--- a/app-dicts/ispell-de-alt/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST hk2-deutsch.tar.gz 375750 SHA512 abd9ad7a3b75b9de8a3303cf5a46f40193e5f397b6f0f412a99270e9a27bb753aca8dfaaa9183674f1f19bed5c3cf94d57b8a53a312d2cbeb05d48cf5d4f3d25
-DIST hkgerman_2-patch-bj1.diff.gz 15187 SHA512 00ad71bde5ea8a13fe50608f85a901cff4c2498c6e65ca6838a930c38db682f6789ddcb01c79b335799866e60ddf59cd5454f3600167033276c2905a4216eadc
diff --git a/app-dicts/ispell-de-alt/ispell-de-alt-2-r1.ebuild b/app-dicts/ispell-de-alt/ispell-de-alt-2-r1.ebuild
deleted file mode 100644
index 94528fee..00000000
--- a/app-dicts/ispell-de-alt/ispell-de-alt-2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-DESCRIPTION="German dictionary (traditional orthography) for ispell"
-HOMEPAGE="http://www.lasr.cs.ucla.edu/geoff/ispell-dictionaries.html"
-SRC_URI="ftp://ftp.informatik.uni-kiel.de/pub/kiel/dicts/hk${PV}-deutsch.tar.gz
- http://www.j3e.de/ispell/hk2/hkgerman_2-patch-bj1.diff.gz"
-
-# GPL according to <http://bugs.debian.org/131124#25>
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
-IUSE=""
-
-BDEPEND="app-text/ispell:="
-RDEPEND="${BDEPEND}"
-
-S="${WORKDIR}"
-
-PATCHES=(hkgerman_2-patch-bj1.diff)
-
-src_install() {
- insinto /usr/$(get_libdir)/ispell
- doins deutsch.aff deutsch.hash
- dosym deutsch.aff /usr/$(get_libdir)/ispell/de_DE_1901.aff
- dosym deutsch.hash /usr/$(get_libdir)/ispell/de_DE_1901.hash
- dodoc ANNOUNCE Changes Contributors README*
-}
diff --git a/app-dicts/ispell-de-alt/metadata.xml b/app-dicts/ispell-de-alt/metadata.xml
deleted file mode 100644
index 097975e3..00000000
--- a/app-dicts/ispell-de-alt/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/app-dicts/ispell-de/Manifest b/app-dicts/ispell-de/Manifest
deleted file mode 100644
index 987504d6..00000000
--- a/app-dicts/ispell-de/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST igerman98-20161207.tar.bz2 470207 SHA512 62be84ac76fd2a0acc25439aa4c04339e54a1c7a2f619d76e0e01cfb53eeeca263c5cc335e315f9adeee9bab5cc392d4c473ca55cbed371c04c123d6fa2272aa
diff --git a/app-dicts/ispell-de/ispell-de-20161207.ebuild b/app-dicts/ispell-de/ispell-de-20161207.ebuild
deleted file mode 100644
index 3e2d59cc..00000000
--- a/app-dicts/ispell-de/ispell-de-20161207.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-MY_P=igerman98-${PV}
-
-DESCRIPTION="German and Swiss dictionaries for ispell"
-HOMEPAGE="http://j3e.de/ispell/igerman98/"
-SRC_URI="http://j3e.de/ispell/igerman98/dict/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-KEYWORDS="alpha amd64 hppa mips ppc sparc x86"
-
-BDEPEND="app-text/ispell:="
-RDEPEND="${BDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
- for lang in de_DE de_AT de_CH; do
- emake ispell/${lang}{.aff,.hash}
- done
-}
-
-src_install () {
- insinto /usr/$(get_libdir)/ispell
- for lang in de_DE de_AT de_CH; do
- doins ispell/${lang}{.aff,.hash}
- done
-
- dodoc Documentation/*
- rm -f -- "${ED}/usr/share/doc/${PF}/GPL"*
-}
diff --git a/app-dicts/ispell-de/metadata.xml b/app-dicts/ispell-de/metadata.xml
deleted file mode 100644
index 097975e3..00000000
--- a/app-dicts/ispell-de/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/app-dicts/stardict-dictd-BritannicaConcise/ChangeLog b/app-dicts/stardict-dictd-BritannicaConcise/ChangeLog
new file mode 100644
index 00000000..c9483a90
--- /dev/null
+++ b/app-dicts/stardict-dictd-BritannicaConcise/ChangeLog
@@ -0,0 +1,19 @@
+# ChangeLog for app-dicts/stardict-dictd-BritannicaConcise
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 28 Mar 2010; Martin Väth <martin@mvath.de>:
+ stardict-dictd-BritannicaConcise-2.4.2.ebuild:
+ import with minor changes from a personal overlay.
diff --git a/app-dicts/stardict-dictd-BritannicaConcise/Manifest b/app-dicts/stardict-dictd-BritannicaConcise/Manifest
index f91a0897..a5b1dbc5 100644
--- a/app-dicts/stardict-dictd-BritannicaConcise/Manifest
+++ b/app-dicts/stardict-dictd-BritannicaConcise/Manifest
@@ -1 +1 @@
-DIST stardict-BritannicaConcise-2.4.2.tar.bz2 6999821 SHA512 7602ea25c227c6334feed7ccf6c182f24585f6e634e7f00126eb1f0c64c92c9c9c1efb3daefad4b67bd7ac95509d1a7cf983337182eea6567ef82979de703be7
+DIST stardict-BritannicaConcise-2.4.2.tar.bz2 6999821 SHA256 f25aae8633b4b4f87424b745c87478772e74351d8674e756ef6252c087e01e9c SHA512 7602ea25c227c6334feed7ccf6c182f24585f6e634e7f00126eb1f0c64c92c9c9c1efb3daefad4b67bd7ac95509d1a7cf983337182eea6567ef82979de703be7 WHIRLPOOL 6dfe6e77a504dcf70bfe140474846949cc5191359cb4a9870c7360fcbe87ca42557cdba90bc51b6e37f6d96f98196e2a8ca263c93c219d791eae9952a1e58b90
diff --git a/app-dicts/stardict-dictd-BritannicaConcise/metadata.xml b/app-dicts/stardict-dictd-BritannicaConcise/metadata.xml
index b919c846..73a6d343 100644
--- a/app-dicts/stardict-dictd-BritannicaConcise/metadata.xml
+++ b/app-dicts/stardict-dictd-BritannicaConcise/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-dicts/stardict-dictd-BritannicaConcise/stardict-dictd-BritannicaConcise-2.4.2.ebuild b/app-dicts/stardict-dictd-BritannicaConcise/stardict-dictd-BritannicaConcise-2.4.2.ebuild
index db31babd..b97fbcd2 100644
--- a/app-dicts/stardict-dictd-BritannicaConcise/stardict-dictd-BritannicaConcise-2.4.2.ebuild
+++ b/app-dicts/stardict-dictd-BritannicaConcise/stardict-dictd-BritannicaConcise-2.4.2.ebuild
@@ -1,11 +1,18 @@
-# Copyright 2010-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
-RESTRICT="fetch"
+EAPI=5
DICT_PREFIX=""
-inherit stardict
+inherit eutils stardict
+RESTRICT="mirror"
+
DESCRIPTION="Stardict Dictionary for Dictd.org's The Britannica Concise Encyclopedia"
HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php"
-KEYWORDS="amd64 ~arm64 x86"
+
+KEYWORDS="~amd64 ~x86"
IUSE=""
+
+src_prepare() {
+ epatch_user
+}
diff --git a/app-dicts/stardict-dictd-cced/ChangeLog b/app-dicts/stardict-dictd-cced/ChangeLog
new file mode 100644
index 00000000..7c868f77
--- /dev/null
+++ b/app-dicts/stardict-dictd-cced/ChangeLog
@@ -0,0 +1,19 @@
+# ChangeLog for app-dicts/stardict-dictd-cced
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 28 Mar 2010; Martin Väth <martin@mvath.de>:
+ stardict-dictd-cced-2.4.2.ebuild:
+ import with minor changes from a personal overlay.
diff --git a/app-dicts/stardict-dictd-cced/Manifest b/app-dicts/stardict-dictd-cced/Manifest
index b1bb507b..06b1879f 100644
--- a/app-dicts/stardict-dictd-cced/Manifest
+++ b/app-dicts/stardict-dictd-cced/Manifest
@@ -1 +1 @@
-DIST stardict-cced-2.4.2.tar.bz2 5151533 SHA512 7aef11c0ba0eb7e47d1cc44e853f3b60215eb768ea72bf02ab62a100748e0614fe91bde9b11504e664b09b3aac4a0193dabbd76d46f2af501e7da4cec8fe5ff8
+DIST stardict-cced-2.4.2.tar.bz2 5151533 SHA256 0d67c82164aa44622c8dd652afd4445b4cb5b7ed7c426e8d68cd822a130ba9ef SHA512 7aef11c0ba0eb7e47d1cc44e853f3b60215eb768ea72bf02ab62a100748e0614fe91bde9b11504e664b09b3aac4a0193dabbd76d46f2af501e7da4cec8fe5ff8 WHIRLPOOL 2656c917f48cf13ef953cb2b7d6d2d70cf4fe1fc0c9ab8a309ad30d6b2b298ceed4343df77ea0c24d3a76ea1c9c897117363442be222943eb8fbe0023916ba41
diff --git a/app-dicts/stardict-dictd-cced/metadata.xml b/app-dicts/stardict-dictd-cced/metadata.xml
index b919c846..73a6d343 100644
--- a/app-dicts/stardict-dictd-cced/metadata.xml
+++ b/app-dicts/stardict-dictd-cced/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-dicts/stardict-dictd-cced/stardict-dictd-cced-2.4.2.ebuild b/app-dicts/stardict-dictd-cced/stardict-dictd-cced-2.4.2.ebuild
index 75455030..b3d00897 100644
--- a/app-dicts/stardict-dictd-cced/stardict-dictd-cced-2.4.2.ebuild
+++ b/app-dicts/stardict-dictd-cced/stardict-dictd-cced-2.4.2.ebuild
@@ -1,12 +1,18 @@
-# Copyright 2010-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
-RESTRICT="fetch"
+EAPI=5
DICT_PREFIX=""
-inherit stardict
+inherit eutils stardict
+RESTRICT="mirror"
+
DESCRIPTION="Stardict Dictionary for Dictd.org's Collins Cobuild English Dictionary"
HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
+
+src_prepare() {
+ epatch_user
+}
diff --git a/app-dicts/stardict-dictd-longman/ChangeLog b/app-dicts/stardict-dictd-longman/ChangeLog
new file mode 100644
index 00000000..2a42994e
--- /dev/null
+++ b/app-dicts/stardict-dictd-longman/ChangeLog
@@ -0,0 +1,19 @@
+# ChangeLog for app-dicts/stardict-dictd-longman
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 28 Mar 2010; Martin Väth <martin@mvath.de>:
+ stardict-dictd-longman-2.4.2.ebuild:
+ import with minor changes from a personal overlay.
diff --git a/app-dicts/stardict-dictd-longman/Manifest b/app-dicts/stardict-dictd-longman/Manifest
index d17dbb75..b558fbf0 100644
--- a/app-dicts/stardict-dictd-longman/Manifest
+++ b/app-dicts/stardict-dictd-longman/Manifest
@@ -1 +1 @@
-DIST stardict-longman-2.4.2.tar.bz2 6402702 SHA512 f11b422518465496f9b2f87870f46fb61e1645ccff4d9fafdd42f3f0957cda1b4142a06b8512f407afb355eb0b29a64195711881aa7eaad12be7d3f004c5aaf0
+DIST stardict-longman-2.4.2.tar.bz2 6402702 SHA256 e6ff22d606f54e6838e7edb590e7beaffd10ce059a6e2e1b2df0fc6b8ee212ec SHA512 f11b422518465496f9b2f87870f46fb61e1645ccff4d9fafdd42f3f0957cda1b4142a06b8512f407afb355eb0b29a64195711881aa7eaad12be7d3f004c5aaf0 WHIRLPOOL 3e2625b4f4a06d36471616daf950c723f82d32b1425d0faf747968cdbf81ecc1eca6be838dbd1acc1b519d37f4098164ff97497431d198d2d2f306c98845bad2
diff --git a/app-dicts/stardict-dictd-longman/metadata.xml b/app-dicts/stardict-dictd-longman/metadata.xml
index b919c846..73a6d343 100644
--- a/app-dicts/stardict-dictd-longman/metadata.xml
+++ b/app-dicts/stardict-dictd-longman/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-dicts/stardict-dictd-longman/stardict-dictd-longman-2.4.2.ebuild b/app-dicts/stardict-dictd-longman/stardict-dictd-longman-2.4.2.ebuild
index 793b0451..08a3e17f 100644
--- a/app-dicts/stardict-dictd-longman/stardict-dictd-longman-2.4.2.ebuild
+++ b/app-dicts/stardict-dictd-longman/stardict-dictd-longman-2.4.2.ebuild
@@ -1,11 +1,18 @@
-# Copyright 2010-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
-RESTRICT="fetch"
+EAPI=5
DICT_PREFIX=""
-inherit stardict
+inherit eutils stardict
+RESTRICT="mirror"
+
DESCRIPTION="Stardict Dictionary for Dictd.org's Longman Dictionary of Contemporary English"
HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php"
-KEYWORDS="amd64 ~arm64 x86"
+
+KEYWORDS="~amd64 ~x86"
IUSE=""
+
+src_prepare() {
+ epatch_user
+}
diff --git a/app-dicts/stardict-dictd-merrianwebster/ChangeLog b/app-dicts/stardict-dictd-merrianwebster/ChangeLog
new file mode 100644
index 00000000..a7bd50c2
--- /dev/null
+++ b/app-dicts/stardict-dictd-merrianwebster/ChangeLog
@@ -0,0 +1,19 @@
+# ChangeLog for app-dicts/stardict-dictd-merrianwebster
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 28 Mar 2010; Martin Väth <martin@mvath.de>:
+ stardict-dictd-merrianwebster-2.4.2.ebuild:
+ import with minor changes from a personal overlay.
diff --git a/app-dicts/stardict-dictd-merrianwebster/Manifest b/app-dicts/stardict-dictd-merrianwebster/Manifest
index 830e084c..d0bdbcca 100644
--- a/app-dicts/stardict-dictd-merrianwebster/Manifest
+++ b/app-dicts/stardict-dictd-merrianwebster/Manifest
@@ -1 +1 @@
-DIST stardict-merrianwebster-2.4.2.tar.bz2 2532552 SHA512 ac2821062fe212b7aa3b974345b0af513a3b39ce448628ff67b2a0ad89ea1af8c8ba48be9aecdde16729dc1630d17787a75c063aa9c198896157409ad16aede6
+DIST stardict-merrianwebster-2.4.2.tar.bz2 2532552 SHA256 e0424bb6087c608fb0b4d1f9c1f406966cf83cd96f2463b299f24b1410a82512 SHA512 ac2821062fe212b7aa3b974345b0af513a3b39ce448628ff67b2a0ad89ea1af8c8ba48be9aecdde16729dc1630d17787a75c063aa9c198896157409ad16aede6 WHIRLPOOL 3a842ade0d5db919b559e13461145a0a62fb526f7ff9e7ba44b6ad7cdd042b5d1772236c55e098f1e93f4c69a43c4b54d0a37211469e05b85d146179c66ae0ff
diff --git a/app-dicts/stardict-dictd-merrianwebster/metadata.xml b/app-dicts/stardict-dictd-merrianwebster/metadata.xml
index b919c846..73a6d343 100644
--- a/app-dicts/stardict-dictd-merrianwebster/metadata.xml
+++ b/app-dicts/stardict-dictd-merrianwebster/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-dicts/stardict-dictd-merrianwebster/stardict-dictd-merrianwebster-2.4.2.ebuild b/app-dicts/stardict-dictd-merrianwebster/stardict-dictd-merrianwebster-2.4.2.ebuild
index 8380f921..219903fe 100644
--- a/app-dicts/stardict-dictd-merrianwebster/stardict-dictd-merrianwebster-2.4.2.ebuild
+++ b/app-dicts/stardict-dictd-merrianwebster/stardict-dictd-merrianwebster-2.4.2.ebuild
@@ -1,11 +1,18 @@
-# Copyright 2010-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
-RESTRICT="fetch"
+EAPI=5
DICT_PREFIX=""
-inherit stardict
+inherit eutils stardict
+RESTRICT="mirror"
+
DESCRIPTION="Stardict Dictionary for Dictd.org's Merrian Webster 10th dictionary"
HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php"
-KEYWORDS="amd64 ~arm64 x86"
+
+KEYWORDS="~amd64 ~x86"
IUSE=""
+
+src_prepare() {
+ epatch_user
+}
diff --git a/app-dicts/stardict-dictd-oald/ChangeLog b/app-dicts/stardict-dictd-oald/ChangeLog
new file mode 100644
index 00000000..17c11ca2
--- /dev/null
+++ b/app-dicts/stardict-dictd-oald/ChangeLog
@@ -0,0 +1,19 @@
+# ChangeLog for app-dicts/stardict-dictd-oald
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 28 Mar 2010; Martin Väth <martin@mvath.de>:
+ stardict-dictd-oald-2.4.2.ebuild:
+ import with minor changes from a personal overlay.
diff --git a/app-dicts/stardict-dictd-oald/Manifest b/app-dicts/stardict-dictd-oald/Manifest
index b11561dc..085fc625 100644
--- a/app-dicts/stardict-dictd-oald/Manifest
+++ b/app-dicts/stardict-dictd-oald/Manifest
@@ -1 +1 @@
-DIST stardict-oald-2.4.2.tar.bz2 4730785 SHA512 bd9c72f9ace2e8d7c35ed22a16a80d28aadc4c5210843469a2d1c24f6cf18738e8655d7a26b2185c934b4de1a679e5bb424ac26df2705f8f5f61479e9e351075
+DIST stardict-oald-2.4.2.tar.bz2 4730785 SHA256 c8f279f1013cfe4ed2becbcb541caca6c4fe51482da2c4726aa7aaef93f30e71 SHA512 bd9c72f9ace2e8d7c35ed22a16a80d28aadc4c5210843469a2d1c24f6cf18738e8655d7a26b2185c934b4de1a679e5bb424ac26df2705f8f5f61479e9e351075 WHIRLPOOL a873310fcdb5b06675438f167472e1205f52bc8526715fcea90c168c803f7212147ff08e344cc42aa328ca4e3ac7f4c12ac0077794e6a3c7f2184b57ba8857d2
diff --git a/app-dicts/stardict-dictd-oald/metadata.xml b/app-dicts/stardict-dictd-oald/metadata.xml
index b919c846..73a6d343 100644
--- a/app-dicts/stardict-dictd-oald/metadata.xml
+++ b/app-dicts/stardict-dictd-oald/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-dicts/stardict-dictd-oald/stardict-dictd-oald-2.4.2.ebuild b/app-dicts/stardict-dictd-oald/stardict-dictd-oald-2.4.2.ebuild
index ea54f28b..cfa4f341 100644
--- a/app-dicts/stardict-dictd-oald/stardict-dictd-oald-2.4.2.ebuild
+++ b/app-dicts/stardict-dictd-oald/stardict-dictd-oald-2.4.2.ebuild
@@ -1,11 +1,18 @@
-# Copyright 2010-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
-RESTRICT="fetch"
+EAPI=5
DICT_PREFIX=""
-inherit stardict
+inherit eutils stardict
+RESTRICT="mirror"
+
DESCRIPTION="Stardict Dictionary for Dictd.org's Oxford Advanced Learner's Dictionary"
HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php"
-KEYWORDS="amd64 ~arm64 x86"
+
+KEYWORDS="~amd64 ~x86"
IUSE=""
+
+src_prepare() {
+ epatch_user
+}
diff --git a/app-dicts/stardict-dictd-thesaurus-ee/ChangeLog b/app-dicts/stardict-dictd-thesaurus-ee/ChangeLog
new file mode 100644
index 00000000..ed37ca46
--- /dev/null
+++ b/app-dicts/stardict-dictd-thesaurus-ee/ChangeLog
@@ -0,0 +1,19 @@
+# ChangeLog for app-dicts/stardict-dictd-thesaurus-ee
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 28 Mar 2010; Martin Väth <martin@mvath.de>:
+ stardict-dictd-thesaurus-ee-2.4.2.ebuild:
+ import with minor changes from a personal overlay.
diff --git a/app-dicts/stardict-dictd-thesaurus-ee/Manifest b/app-dicts/stardict-dictd-thesaurus-ee/Manifest
index 383a8972..8f54f812 100644
--- a/app-dicts/stardict-dictd-thesaurus-ee/Manifest
+++ b/app-dicts/stardict-dictd-thesaurus-ee/Manifest
@@ -1 +1 @@
-DIST stardict-thesaurus-ee-2.4.2.tar.bz2 2234937 SHA512 96b6416472507e20e7570c36123fd55c3f26fec19c74cb4ce18d0d67ef2c9685807b5f72ede293b8d0ba15c3e98df47c44c22a8865b7b74d2ac83934e1ebf6f2
+DIST stardict-thesaurus-ee-2.4.2.tar.bz2 2234937 SHA256 91f0b221d16a7fb67befddae6487f08d7b76dfe0342a4e6b01677167115ee135 SHA512 96b6416472507e20e7570c36123fd55c3f26fec19c74cb4ce18d0d67ef2c9685807b5f72ede293b8d0ba15c3e98df47c44c22a8865b7b74d2ac83934e1ebf6f2 WHIRLPOOL 8415bd369e29013fc43c7f7c44e35c152cb17ba718c5109a61a42aba8fb9bde89ff6c3e3bf51aa415b33a5770f007801c41f69bb6fc112cdc1195ca64a860c76
diff --git a/app-dicts/stardict-dictd-thesaurus-ee/metadata.xml b/app-dicts/stardict-dictd-thesaurus-ee/metadata.xml
index b919c846..73a6d343 100644
--- a/app-dicts/stardict-dictd-thesaurus-ee/metadata.xml
+++ b/app-dicts/stardict-dictd-thesaurus-ee/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-dicts/stardict-dictd-thesaurus-ee/stardict-dictd-thesaurus-ee-2.4.2.ebuild b/app-dicts/stardict-dictd-thesaurus-ee/stardict-dictd-thesaurus-ee-2.4.2.ebuild
index e5d10fd1..bdf0b458 100644
--- a/app-dicts/stardict-dictd-thesaurus-ee/stardict-dictd-thesaurus-ee-2.4.2.ebuild
+++ b/app-dicts/stardict-dictd-thesaurus-ee/stardict-dictd-thesaurus-ee-2.4.2.ebuild
@@ -1,11 +1,18 @@
-# Copyright 2010-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
-RESTRICT="fetch"
+EAPI=5
DICT_PREFIX=""
-inherit stardict
+inherit eutils stardict
+RESTRICT="mirror"
+
DESCRIPTION="Stardict Dictionary for Dictd.org's English Thesaurus"
HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.dict.org.php"
-KEYWORDS="amd64 ~arm64 x86"
+
+KEYWORDS="~amd64 ~x86"
IUSE=""
+
+src_prepare() {
+ epatch_user
+}
diff --git a/app-dicts/stardict-freedict-deu-eng/ChangeLog b/app-dicts/stardict-freedict-deu-eng/ChangeLog
new file mode 100644
index 00000000..419f79b4
--- /dev/null
+++ b/app-dicts/stardict-freedict-deu-eng/ChangeLog
@@ -0,0 +1,22 @@
+# ChangeLog for app-dicts/stardict-freedict-deu-eng
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 31 Oct 2010; Martin Väth <martin@mvath.de>:
+ Fix description.
+
+ 28 Mar 2010; Martin Väth <martin@mvath.de>:
+ stardict-freedict-deu-eng-2.4.2.ebuild:
+ import with minor changes from a personal overlay.
diff --git a/app-dicts/stardict-freedict-deu-eng/Manifest b/app-dicts/stardict-freedict-deu-eng/Manifest
index 270368f8..5a2b8c6f 100644
--- a/app-dicts/stardict-freedict-deu-eng/Manifest
+++ b/app-dicts/stardict-freedict-deu-eng/Manifest
@@ -1 +1 @@
-DIST stardict-dictd_www.freedict.de_deu-eng-2.4.2.tar.bz2 2078539 SHA512 acd24ab6762198d770a396ceabf907cc1ae1dea7580053da053a8bb014e14791ce820f79266dc95e658cabfff23b682f97a5951ed24d825236158e2213c80fee
+DIST stardict-dictd_www.freedict.de_deu-eng-2.4.2.tar.bz2 2078539 SHA256 b0438a564b71a44e65a1f38d9bea68800471fbd1aa6020127229a4abe258601f SHA512 acd24ab6762198d770a396ceabf907cc1ae1dea7580053da053a8bb014e14791ce820f79266dc95e658cabfff23b682f97a5951ed24d825236158e2213c80fee WHIRLPOOL 4f8fc2b9fc4afa7537f2d5192a043bc7d0cca16afad9337a8d02bf6b69ec9aae66a7c89a1091fa5c9288f343ff4d3febe7a707359eb8bfb67d284bdc2926c41b
diff --git a/app-dicts/stardict-freedict-deu-eng/metadata.xml b/app-dicts/stardict-freedict-deu-eng/metadata.xml
index b919c846..73a6d343 100644
--- a/app-dicts/stardict-freedict-deu-eng/metadata.xml
+++ b/app-dicts/stardict-freedict-deu-eng/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-dicts/stardict-freedict-deu-eng/stardict-freedict-deu-eng-2.4.2.ebuild b/app-dicts/stardict-freedict-deu-eng/stardict-freedict-deu-eng-2.4.2.ebuild
index 9874d6a8..339e2a56 100644
--- a/app-dicts/stardict-freedict-deu-eng/stardict-freedict-deu-eng-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-deu-eng/stardict-freedict-deu-eng-2.4.2.ebuild
@@ -1,13 +1,18 @@
-# Copyright 2010-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
-RESTRICT="fetch"
+EAPI=5
FROM_LANG="German"
TO_LANG="English"
DICT_PREFIX="dictd_www.freedict.de_"
-DESCRIPTION=""
-inherit stardict
+inherit eutils stardict
+RESTRICT="mirror"
+
HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.freedict.de.php"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
+
+src_prepare() {
+ epatch_user
+}
diff --git a/app-dicts/stardict-freedict-deu-ita/ChangeLog b/app-dicts/stardict-freedict-deu-ita/ChangeLog
new file mode 100644
index 00000000..cc1b172e
--- /dev/null
+++ b/app-dicts/stardict-freedict-deu-ita/ChangeLog
@@ -0,0 +1,19 @@
+# ChangeLog for app-dicts/stardict-freedict-deu-ita
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 28 Mar 2010; Martin Väth <martin@mvath.de>:
+ stardict-freedict-deu-ita-2.4.2.ebuild:
+ import with minor changes from a personal overlay.
diff --git a/app-dicts/stardict-freedict-deu-ita/Manifest b/app-dicts/stardict-freedict-deu-ita/Manifest
index d31e7ff6..ca976b4b 100644
--- a/app-dicts/stardict-freedict-deu-ita/Manifest
+++ b/app-dicts/stardict-freedict-deu-ita/Manifest
@@ -1 +1 @@
-DIST stardict-dictd_www.freedict.de_deu-ita-2.4.2.tar.bz2 77889 SHA512 eef8736f2796536bda114ce12874b1f772cac4a942c88debe92a82f9b286e22caae93231f322cd74464f90ecf05eef9fd195390b70e0a6939afad0c0aa5165a8
+DIST stardict-dictd_www.freedict.de_deu-ita-2.4.2.tar.bz2 77889 SHA256 5d3b3361b8ed32c1540eca0aad7da8a0b2c96658913cf45b754dcf60e185a733 SHA512 eef8736f2796536bda114ce12874b1f772cac4a942c88debe92a82f9b286e22caae93231f322cd74464f90ecf05eef9fd195390b70e0a6939afad0c0aa5165a8 WHIRLPOOL 4add09ac9cad813c924428d9544396c0401c463c509ff442aa0bcf5dea0add13c6217122b3656c8546c5de3bfa9274b6540860b19e581d45acf9f5acf516d80a
diff --git a/app-dicts/stardict-freedict-deu-ita/metadata.xml b/app-dicts/stardict-freedict-deu-ita/metadata.xml
index b919c846..73a6d343 100644
--- a/app-dicts/stardict-freedict-deu-ita/metadata.xml
+++ b/app-dicts/stardict-freedict-deu-ita/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-dicts/stardict-freedict-deu-ita/stardict-freedict-deu-ita-2.4.2.ebuild b/app-dicts/stardict-freedict-deu-ita/stardict-freedict-deu-ita-2.4.2.ebuild
index 191af05e..61c203aa 100644
--- a/app-dicts/stardict-freedict-deu-ita/stardict-freedict-deu-ita-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-deu-ita/stardict-freedict-deu-ita-2.4.2.ebuild
@@ -1,13 +1,18 @@
-# Copyright 2010-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
-RESTRICT="fetch"
+EAPI=5
FROM_LANG="German"
TO_LANG="Italian"
DICT_PREFIX="dictd_www.freedict.de_"
-DESCRIPTION=""
-inherit stardict
+inherit eutils stardict
+RESTRICT="mirror"
+
HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.freedict.de.php"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
+
+src_prepare() {
+ epatch_user
+}
diff --git a/app-dicts/stardict-freedict-ita-deu/ChangeLog b/app-dicts/stardict-freedict-ita-deu/ChangeLog
new file mode 100644
index 00000000..d27adad1
--- /dev/null
+++ b/app-dicts/stardict-freedict-ita-deu/ChangeLog
@@ -0,0 +1,19 @@
+# ChangeLog for app-dicts/stardict-freedict-ita-deu
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 28 Mar 2010; Martin Väth <martin@mvath.de>:
+ stardict-freedict-ita-deu-2.4.2.ebuild:
+ import with minor changes from a personal overlay.
diff --git a/app-dicts/stardict-freedict-ita-deu/Manifest b/app-dicts/stardict-freedict-ita-deu/Manifest
index 2be634b0..c64a3295 100644
--- a/app-dicts/stardict-freedict-ita-deu/Manifest
+++ b/app-dicts/stardict-freedict-ita-deu/Manifest
@@ -1 +1 @@
-DIST stardict-dictd_www.freedict.de_ita-deu-2.4.2.tar.bz2 60360 SHA512 11489d02f00953d94e72fb15c816fac5a527bb13ddacca0c7c81f9033dbf0f0a50db3450683208e5acfc9df86f69013e2c4fbea49b192a068f70098467306c18
+DIST stardict-dictd_www.freedict.de_ita-deu-2.4.2.tar.bz2 60360 SHA256 1b51359c90c78097eb04a6e144922ee06d3f9616e40bfeab47ccd52f2abed1a2 SHA512 11489d02f00953d94e72fb15c816fac5a527bb13ddacca0c7c81f9033dbf0f0a50db3450683208e5acfc9df86f69013e2c4fbea49b192a068f70098467306c18 WHIRLPOOL 8e27e361b67e8c68a053c558f25d3ddd2de91f25f6cff5fc1a70ff65b93c046c95f450701dd7d14495e277c11ecbcacb37d4d95cf9630748d3b1d13638c046cb
diff --git a/app-dicts/stardict-freedict-ita-deu/metadata.xml b/app-dicts/stardict-freedict-ita-deu/metadata.xml
index b919c846..73a6d343 100644
--- a/app-dicts/stardict-freedict-ita-deu/metadata.xml
+++ b/app-dicts/stardict-freedict-ita-deu/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-dicts/stardict-freedict-ita-deu/stardict-freedict-ita-deu-2.4.2.ebuild b/app-dicts/stardict-freedict-ita-deu/stardict-freedict-ita-deu-2.4.2.ebuild
index 49ef00f8..29c121f2 100644
--- a/app-dicts/stardict-freedict-ita-deu/stardict-freedict-ita-deu-2.4.2.ebuild
+++ b/app-dicts/stardict-freedict-ita-deu/stardict-freedict-ita-deu-2.4.2.ebuild
@@ -1,13 +1,18 @@
-# Copyright 2010-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
FROM_LANG="Italian"
TO_LANG="German"
DICT_PREFIX="dictd_www.freedict.de_"
-DESCRIPTION=""
-inherit stardict
-RESTRICT="fetch"
+inherit eutils stardict
+RESTRICT="mirror"
+
HOMEPAGE="http://stardict.sourceforge.net/Dictionaries_dictd-www.freedict.de.php"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
+
+src_prepare() {
+ epatch_user
+}
diff --git a/app-dicts/steak/Manifest b/app-dicts/steak/Manifest
deleted file mode 100644
index 6b66989a..00000000
--- a/app-dicts/steak/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Steak.1.7.3.tar.bz2 982350 SHA512 cd7217854e9d3b780db4dd4b42eb77aa1c648b2b46ec5a53a73ff7dfb6b0a1330f07a721d7c87165ec424ce2d48b32ea3ae4332415a59ec640eda29a9ca01368
diff --git a/app-dicts/steak/files/steak-1.7.3.patch b/app-dicts/steak/files/steak-1.7.3.patch
deleted file mode 100644
index 19e38fc9..00000000
--- a/app-dicts/steak/files/steak-1.7.3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/woerterbuch
-+++ b/woerterbuch
-@@ -6,13 +6,13 @@
- ################################################################
- #
- # Unter diesem Verzeichnis ist die Woerterbuch-Datei zu finden
--SteakDIR=$HOME/bin/Steak/Datensatz
-+SteakDIR=/usr/share/Steak/Datensatz
- #SteakDIR=$HOME/bin/Steak/Datensatz
- # Der Name der Woerterbuch-Datei
- SteakFILE=ger-eng.txt
- #SteakFILE=Datenbank.txt
- # Unter diesem Verzeichnis ist die ausfuehrbaren Dateien zu finden
--BINDIR=$HOME/bin/Steak
-+BINDIR=/usr/bin
- #BINDIR=$HOME/bin/Steak
- # Temp-Dir
- TMPDIR=/tmp
diff --git a/app-dicts/steak/metadata.xml b/app-dicts/steak/metadata.xml
deleted file mode 100644
index 097975e3..00000000
--- a/app-dicts/steak/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/app-dicts/steak/steak-1.7.3-r3.ebuild b/app-dicts/steak/steak-1.7.3-r3.ebuild
deleted file mode 100644
index 3e10fd06..00000000
--- a/app-dicts/steak/steak-1.7.3-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="EN => DE Dictionary"
-HOMEPAGE="http://www.tm.informatik.uni-frankfurt.de/~razi/steak/steak.html"
-HOMEPAGE="http://www.tm.informatik.uni-frankfurt.de/~razi/steak"
-#SRC_URI="http://www.tm.informatik.uni-frankfurt.de/~razi/steak/program/Steak.${PV}.tar.gz"
-SRC_URI="http://www-stud.rbi.informatik.uni-frankfurt.de/~razi/steak/program/Steak.${PV}.tar.bz2"
-use_rpm=false
-if $use_rpm
-then SRC_URI="ftp://84.41.185.108/suse/9.1/suse/src/${P}-251.src.rpm"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-BDEPEND="app-text/recode"
-! ${use_rpm} || BDEPEND=${BDEPEND}" app-arch/rpm2targz"
-RDEPEND=""
-
-S=${WORKDIR}/Steak
-
-PATCHES=("${FILESDIR}/${P}.patch")
-
-! ${use_rpm} || src_unpack() {
- cd "${WORKDIR}"
- rpm2targz "${DISTDIR}/${A}"
- tar -xzf "${P}-251.src.tar.gz"
- tar -xjpf "Steak.${PV}.tar.bz2"
-}
-
-src_prepare() {
- default
- recode latin1..utf8 "${S}"/Datensatz/ger-eng.txt || die
-}
-
-src_install() {
- insinto /usr/share/Steak/Datensatz
- doins Datensatz/ger-eng.txt
-
- insinto /usr/share/Steak
- doins mini_steak_icon.xpm pinguin_steak_icon.xpm .Steakconfig
-
- dobin woerterbuch printbuffer iso2txt spacefilter poll
- dosym woerterbuch /usr/bin/steak
-
- dodoc copyrights.txt help.txt version.txt README README.eng
-}
diff --git a/app-emacs/mv_emacs/ChangeLog b/app-emacs/mv_emacs/ChangeLog
new file mode 100644
index 00000000..48978e55
--- /dev/null
+++ b/app-emacs/mv_emacs/ChangeLog
@@ -0,0 +1,41 @@
+# ChangeLog for app-emacs/mv_emacs
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*mv_emacs-1.1 (21 Nov 2013)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*mv_emacs-1.1-r1 (24 Jul 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 15 Sep 2012; Martin Väth <martin@mvath.de>:
+ Fix description
+
+ 24 Jul 2012; Martin Väth <martin@mvath.de>:
+ Add site file
+
+*mv_emacs-1.1 (29 Jun 2012)
+
+ 29 Jun 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fixes compatibility issues with emacs-24.
+
+*mv_emacs-1.0 (01 Mar 2012)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 01 Mar 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch.
diff --git a/app-emacs/mv_emacs/Manifest b/app-emacs/mv_emacs/Manifest
index 8da2aa9a..a4d0335e 100644
--- a/app-emacs/mv_emacs/Manifest
+++ b/app-emacs/mv_emacs/Manifest
@@ -1 +1 @@
-DIST mv_emacs-1.4.tar.gz 17933 SHA512 5519d9ba0b85670e0fef7853c791f7bd2a34cb120908065b7ebd1b7b355dbc9ed86938e2196d6da86e1a00780152e8d1631c85304687965efadc7246e4a92562
+DIST mv_emacs-1.2.tar.gz 17842 SHA256 0a87284cf06eda11bfc8b3113651da27f01dfaf8ab7affd3a41ebb27249eff48 SHA512 4fc0f30dd0137b3c642d0e923c5605c93cafc78fa52f6f6b03b26f071b4ca3622e8ab8010d487a77db48f15940c0a7863be70595c8c1091d508bd708b2458b47 WHIRLPOOL bcf8ddd22787ac0ac5876e95861d7ad65bae5d30fe4793fdd45cba4432a58c7edcf86acf5d65b2023616f295b5b349d860ed6eba81c7d02cd42acc6fcb6fe70b
diff --git a/app-emacs/mv_emacs/metadata.xml b/app-emacs/mv_emacs/metadata.xml
index 7857d5a8..4528aa92 100644
--- a/app-emacs/mv_emacs/metadata.xml
+++ b/app-emacs/mv_emacs/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-emacs/mv_emacs/mv_emacs-1.4-r1.ebuild b/app-emacs/mv_emacs/mv_emacs-1.2.ebuild
index 96fc8e06..f3fd39a7 100644
--- a/app-emacs/mv_emacs/mv_emacs-1.4-r1.ebuild
+++ b/app-emacs/mv_emacs/mv_emacs-1.2.ebuild
@@ -1,20 +1,21 @@
-# Copyright 2012-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
-inherit elisp-common
+inherit elisp-common eutils
DESCRIPTION="(X)Emacs extensions: block support, macrorecorder, verify change"
HOMEPAGE="https://github.com/vaeth/mv_emacs/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/vaeth/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-BDEPEND="app-editors/emacs"
+DEPEND="virtual/emacs"
RDEPEND=${DEPEND}
src_unpack() {
@@ -27,13 +28,17 @@ src_unpack() {
EOF
}
+src_prepare() {
+ epatch_user
+}
+
src_compile() {
elisp-make-autoload-file || die
elisp-compile *.el || die
}
src_install() {
- dodoc README.md
+ dodoc README
elisp-install "${PN}" *.el *.elc || die
elisp-site-file-install "sitefile/50${PN}-gentoo.el" || die
}
diff --git a/app-eselect/eselect-net/Manifest b/app-eselect/eselect-net/Manifest
deleted file mode 100644
index 8750cb94..00000000
--- a/app-eselect/eselect-net/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST eselect-net-0.2.tar.gz 4071 SHA512 82f3f47fc0bb49ccdf98d64e1488d72e99caa5d00e4bf1147b540edcd2bc46cbdba5b4a2e4c4f61aaa21626673aa03547cf39644144e6cc45a3de07e2a03ced5
diff --git a/app-eselect/eselect-net/eselect-net-0.2-r1.ebuild b/app-eselect/eselect-net/eselect-net-0.2-r1.ebuild
deleted file mode 100644
index 831e60e4..00000000
--- a/app-eselect/eselect-net/eselect-net-0.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2016-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="eselect module for managing network open-rc service configurations"
-HOMEPAGE="https://github.com/reith/eselect-net/"
-SRC_URI="https://github.com/reith/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE=""
-
-DOCS=(README.md)
-
-src_install() {
- insinto /usr/share/eselect/modules
- doins net.eselect
- dodir /etc/eselect/net/devs /etc/eselect/net/conf.d
-}
diff --git a/app-misc/knapsack/Manifest b/app-misc/knapsack/Manifest
deleted file mode 100644
index 1a6ac960..00000000
--- a/app-misc/knapsack/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST knapsack-7.3.tar.gz 15578 SHA512 b628064d16c2dc9fb9095f83c8a51e247c640cd9d80d50e9027e701fec4b4ef507c687490fde56dfc607430d03eaa7b20d0fe3959b0a5d3d6b4f5132ca92a19f
diff --git a/app-misc/knapsack/knapsack-7.3.ebuild b/app-misc/knapsack/knapsack-7.3.ebuild
deleted file mode 100644
index 31cc02c3..00000000
--- a/app-misc/knapsack/knapsack-7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2017-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="A fast solver for the 0/1-knapsack problem with multiple knapsacks"
-HOMEPAGE="https://github.com/vaeth/knapsack/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE=""
-
-DOCS=(knapsack.txt README.md ChangeLog)
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}"
diff --git a/app-misc/knapsack/metadata.xml b/app-misc/knapsack/metadata.xml
deleted file mode 100644
index fd9ee3b3..00000000
--- a/app-misc/knapsack/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <bugs-to>mailto:martin@mvath.de</bugs-to>
- <remote-id type="github">vaeth/knapsack</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-misc/machine-learning-mv/Manifest b/app-misc/machine-learning-mv/Manifest
deleted file mode 100644
index b503382a..00000000
--- a/app-misc/machine-learning-mv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST machine-learning-mv-1.3.tar.gz 3977 SHA512 220f5f90eadca17c0213953bdf5dbe8b3c248c3cae55ea67e52cb4ee018b4a7105b1887c90af0eca646894e7f31dd250797689d2d8b90fdd99beebdbeefff88e
diff --git a/app-misc/machine-learning-mv/machine-learning-mv-1.3.ebuild b/app-misc/machine-learning-mv/machine-learning-mv-1.3.ebuild
deleted file mode 100644
index 5cee288d..00000000
--- a/app-misc/machine-learning-mv/machine-learning-mv-1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2017-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="Some machine learning experiments"
-HOMEPAGE="https://github.com/vaeth/machine-learning-mv/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.12"
-
-src_prepare() {
- use prefix || sed -i \
- -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
- -- bin/* || die
- default
-}
-
-src_install() {
- default
- dobin bin/*
- insinto /usr/share/zsh/site-functions
- doins zsh/_*
-}
diff --git a/app-misc/machine-learning-mv/metadata.xml b/app-misc/machine-learning-mv/metadata.xml
deleted file mode 100644
index 0ebd67b9..00000000
--- a/app-misc/machine-learning-mv/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <bugs-to>mailto:martin@mvath.de</bugs-to>
- <remote-id type="github">vaeth/machine-learning-mv</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-mobilephone/adb-sync/Manifest b/app-mobilephone/adb-sync/Manifest
deleted file mode 100644
index 3616b559..00000000
--- a/app-mobilephone/adb-sync/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST adb-sync-0_p20190101.tar.gz 13956 BLAKE2B 380109fa302fc5376de8124aa31c3fa03a27ece22d7f2d74638a5387820ad7c2b294daa6e8185f6eef49524e987d7a7f1222a1ee3b6550247993ebcc7c1ac98d SHA512 8bd5eb514c63327860017402f509231a0882cd3624ed3350039b2383f38e503abc6cd319ff41a47d70031958b0b38b973c36272fc4af6e69cce54e15e6bb6990
diff --git a/app-mobilephone/adb-sync/adb-sync-0_p20190101.ebuild b/app-mobilephone/adb-sync/adb-sync-0_p20190101.ebuild
deleted file mode 100644
index 01ee4b7d..00000000
--- a/app-mobilephone/adb-sync/adb-sync-0_p20190101.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit python-single-r1
-
-COMMIT=fb7c549753de7a5579ed3400dd9f8ac71f7bf1b1
-
-DESCRIPTION="Synchronize files between a PC and an Android device using ADB"
-HOMEPAGE="https://github.com/google/adb-sync"
-SRC_URI="https://github.com/google/adb-sync/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+channel"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
- dev-util/android-tools
- channel? ( net-misc/socat )"
-DEPEND=""
-
-S="${WORKDIR}/adb-sync-${COMMIT}"
-
-src_install() {
- dodoc README.md
- python_doscript adb-sync
- use channel && dobin adb-channel
-}
diff --git a/app-mobilephone/adb-sync/metadata.xml b/app-mobilephone/adb-sync/metadata.xml
deleted file mode 100644
index d076f30c..00000000
--- a/app-mobilephone/adb-sync/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <bugs-to>https://github.com/google/adb-sync/issues</bugs-to>
- <remote-id type="github">google/adb-sync</remote-id>
- </upstream>
- <use>
- <flag name="channel">Install the adb-channel script</flag>
- </use>
-</pkgmetadata>
diff --git a/app-portage/changelog-gitrepo/Manifest b/app-portage/changelog-gitrepo/Manifest
deleted file mode 100644
index 75d5b2a7..00000000
--- a/app-portage/changelog-gitrepo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST changelog-gitrepo-1.1.tar.gz 1918 SHA512 f93051f7f4167e82a96314d08cdc0c55e91116821315b1b48221ff44ef176a191a3d2a74471b2e0f867582a260bfac031b5f7a417e1bcc1052d58d620b3437c2
diff --git a/app-portage/changelog-gitrepo/changelog-gitrepo-1.1.ebuild b/app-portage/changelog-gitrepo/changelog-gitrepo-1.1.ebuild
deleted file mode 100644
index 8fd7875e..00000000
--- a/app-portage/changelog-gitrepo/changelog-gitrepo-1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2011-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="Create ChangeLog data for gentoo repositories from git"
-HOMEPAGE="https://github.com/vaeth/changelog-gitrepo/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-vcs/git"
-
-src_install() {
- dodoc README.md
- dobin bin/*
-}
diff --git a/app-portage/changelog-gitrepo/metadata.xml b/app-portage/changelog-gitrepo/metadata.xml
deleted file mode 100644
index 7ba1c1b2..00000000
--- a/app-portage/changelog-gitrepo/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <bugs-to>mailto:martin@mvath.de</bugs-to>
- <remote-id type="github">vaeth/changelog-gitrepo</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
new file mode 100644
index 00000000..667bff3f
--- /dev/null
+++ b/app-portage/eix/ChangeLog
@@ -0,0 +1,54 @@
+# ChangeLog for app-portage/eix
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 03 Oct 2015; Martin Väth <martin@mvath.de>:
+ Update gettext deps
+
+ 19 Oct 2014; Martin Väth <martin@mvath.de>:
+ Update gettext deps
+
+ 12 Oct 2014; Martin Väth <martin@mvath.de>:
+ Update gettext deps
+
+ 22 Aug 2014; Martin Väth <martin@mvath.de>:
+ Remove --with-ebuild-sh-default
+
+ 05 Apr 2014; Martin Väth <martin@mvath.de>:
+ Fix path to ebuild.sh (#506596)
+
+ 01 Feb 2014; Martin Väth <martin@mvath.de>:
+ Move eix to Github; add /usr/lib/tmpfiles.d/eix.conf support
+
+ 01 Nov 2013; Martin Väth <martin@mvath.de>:
+ Remove IUSE=clang
+
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Bump to git-r3.eclass
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 14 Jun 2013; Martin Väth <martin@mvath.de>:
+ remove app-shells/push from DEPEND
+
+ 19 Mar 2013; Martin Väth <martin@mvath.de>:
+ Require >=gettext-0.18.2. Add USE=swap-remote.
+
+ 26 Jan 2013; Martin Väth <martin@mvath.de>:
+ Add IUSE=strong-security
+
+ 14 Jan 2013; Martin Väth <martin@mvath.de>:
+ Simplify handling of REPLACING_VERSIONS
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 15 Jul 2012; Martin Väth <martin@mvath.de>:
+ Update USE to match >=eix-0.26.0
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 16 Apr 2012; Martin Väth <martin@mvath.de>:
+ Bump from the tree to make live ebuild; remove previous ChangeLog
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
deleted file mode 100644
index 18b3f0fb..00000000
--- a/app-portage/eix/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST eix-0.35.2.tar.xz 636616 SHA512 39ff4c4f31be3c40a17a77626c25550a3881d8c405ebd9e7a361252cb729f9c0fc40831bc41e503fdea9f05684ad0eaa1aceabba1c6e4067a33a8581bf5a9625
diff --git a/app-portage/eix/eix-0.35.2.ebuild b/app-portage/eix/eix-0.35.2.ebuild
deleted file mode 100644
index 1079e11c..00000000
--- a/app-portage/eix/eix-0.35.2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2021 Martin V\"ath and others
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror" # do not access gentoo mirror until it actually is there
-MESON_AUTO_DEPEND=no
-inherit bash-completion-r1 meson tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-PLOCALES="de ru"
-IUSE="cpu_flags_x86_sse2 debug +dep doc +jumbo-build"
-for i in ${PLOCALES}; do
- IUSE+=" l10n_${i}"
-done
-IUSE+=" +meson nls optimization +protobuf +required-use security +src-uri strong-optimization strong-security sqlite swap-remote tools usr-portage"
-
-DEPEND="nls? ( virtual/libintl )
- sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${DEPEND}
- >=app-shells/push-3.1
- >=app-shells/quoter-4.1"
-BDEPEND="meson? (
- >=dev-util/meson-0.41.0
- >=dev-util/ninja-1.7.2
- strong-optimization? ( >=sys-devel/gcc-config-1.9.1 )
- )
- protobuf? ( dev-libs/protobuf:= )
- app-arch/xz-utils
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- # remove stale cache file to prevent collisions
- local old_cache="${EROOT}var/cache/${PN}"
- test -f "${old_cache}" && rm -f -- "${old_cache}"
-}
-
-src_prepare() {
- sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf || die
- default
-}
-
-src_configure() {
- local i
- export LINGUAS=
- for i in ${PLOCALES}; do
- use l10n_${i} && LINGUAS+=${LINGUAS:+ }${i}
- done
- if use meson; then
- local emesonargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${P}"
- -Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html"
- $(meson_use jumbo-build)
- $(meson_use sqlite)
- $(meson_use protobuf)
- $(meson_use doc extra-doc)
- $(meson_use nls)
- $(meson_use tools separate-tools)
- $(meson_use security)
- $(meson_use optimization normal-optimization)
- $(meson_use strong-security)
- $(meson_use strong-optimization)
- $(meson_use debug debugging)
- $(meson_use swap-remote)
- $(meson_use prefix always-accept-keywords)
- $(meson_use cpu_flags_x86_sse2 sse2)
- $(meson_use dep dep-default)
- $(meson_use required-use required-use-default)
- $(meson_use src-uri src-uri-default)
- $(usex usr-portage -Dportdir-default=/usr/portage '')
- -Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions"
- -Dportage-rootpath="${ROOTPATH}"
- -Deprefix-default="${EPREFIX}"
- )
- if use prefix; then
- emesonarge+=(
- -Deix-user=
- -Deix-uid=-1
- )
- fi
- meson_src_configure
- else
- local myconf=(
- $(use_enable jumbo-build)
- $(use_with sqlite)
- $(use_with protobuf)
- $(use_with doc extra-doc)
- $(use_enable nls)
- $(use_enable tools separate-tools)
- $(use_enable security)
- $(use_enable optimization)
- $(use_enable strong-security)
- $(use_enable strong-optimization)
- $(use_enable debug debugging)
- $(use_enable swap-remote)
- $(use_with prefix always-accept-keywords)
- $(use_with cpu_flags_x86_sse2 sse2)
- $(use_with dep dep-default)
- $(use_with required-use required-use-default)
- $(use_with src-uri src-uri-default)
- $(use_with usr-portage portdir-default /usr/portage)
- --with-zsh-completion
- --with-portage-rootpath="${ROOTPATH}"
- --with-eprefix-default="${EPREFIX}"
- )
- if use prefix; then
- myconf+=(
- --with-eix-user=
- --with-eix-uid=-1
- )
- fi
- econf "${myconf[@]}"
- fi
-}
-
-src_compile() {
- if use meson; then
- meson_src_compile
- else
- default
- fi
-}
-
-src_test() {
- if use meson; then
- meson_src_test
- else
- default
- fi
-}
-
-src_install() {
- if use meson; then
- meson_src_install
- else
- default
- fi
- dobashcomp bash/eix
- dotmpfiles tmpfiles.d/eix.conf
- use doc && dodoc src/output/eix.proto
-}
-
-pkg_postinst() {
- local obs="${EROOT}var/cache/eix.previous"
- if test -f "${obs}"; then
- ewarn "Found obsolete ${obs}, please remove it"
- fi
- tmpfiles_process eix.conf
-}
-
-pkg_postrm() {
- if [ -z "${REPLACED_BY_VERSION}" ]; then
- rm -rf -- "${EROOT}var/cache/${PN}"
- fi
-}
diff --git a/app-portage/eix/eix-99999999.ebuild b/app-portage/eix/eix-99999999.ebuild
index e10b947e..ef6af13f 100644
--- a/app-portage/eix/eix-99999999.ebuild
+++ b/app-portage/eix/eix-99999999.ebuild
@@ -1,178 +1,78 @@
-# Copyright 1999-2021 Martin V\"ath and others
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
-WANT_LIBTOOL=none
-AUTOTOOLS_AUTO_DEPEND=no
-MESON_AUTO_DEPEND=no
-inherit autotools bash-completion-r1 meson tmpfiles
+EAPI=5
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-case ${PV} in
-99999999*)
- EGIT_REPO_URI="https://github.com/vaeth/${PN}.git"
- inherit git-r3
- SRC_URI=""
- KEYWORDS=""
- PROPERTIES="live";;
-*)
- RESTRICT="mirror"
- EGIT_COMMIT="b96d3026513fc35a326fcf253cc7868b02959289"
- SRC_URI="https://github.com/vaeth/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
-esac
+EGIT_REPO_URI="git://github.com/vaeth/${PN}.git"
+WANT_LIBTOOL=none
+PLOCALES="de ru"
+inherit autotools bash-completion-r1 eutils git-r3 l10n
-DESCRIPTION="Search and query ebuilds"
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI=""
+PROPERTIES="live"
LICENSE="GPL-2"
SLOT="0"
-PLOCALES="de ru"
-IUSE="cpu_flags_x86_sse2 debug +dep doc +jumbo-build"
-for i in ${PLOCALES}; do
- IUSE+=" l10n_${i}"
-done
-IUSE+=" +meson nls optimization +protobuf +required-use security +src-uri strong-optimization strong-security sqlite swap-remote tools usr-portage"
+KEYWORDS=""
+IUSE="debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools"
-DEPEND="nls? ( virtual/libintl )
- sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${DEPEND}
- >=app-shells/push-3.1
- >=app-shells/quoter-4.1"
-BDEPEND="meson? (
- >=dev-util/meson-0.41.0
- >=dev-util/ninja-1.7.2
- strong-optimization? ( >=sys-devel/gcc-config-1.9.1 )
- nls? ( sys-devel/gettext )
- )
- !meson? ( ${AUTOTOOLS_DEPEND} >=sys-devel/gettext-0.19.6 )
- protobuf? ( dev-libs/protobuf:= )"
+BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
+ nls? ( virtual/libintl )"
+RDEPEND="${BOTHDEPEND}
+ app-shells/push"
+DEPEND="${BOTHDEPEND}
+ >=sys-devel/gettext-0.19.6"
pkg_setup() {
- # remove stale cache file to prevent collisions
- local old_cache="${EROOT}var/cache/${PN}"
- test -f "${old_cache}" && rm -f -- "${old_cache}"
+ case " ${REPLACING_VERSIONS}" in
+ *\ 0.[0-9].*|*\ 0.1[0-9].*|*\ 0.2[0-4].*|*\ 0.25.0*)
+ local eixcache="${EROOT}/var/cache/${PN}"
+ test -f "${eixcache}" && rm -f -- "${eixcache}";;
+ esac
}
src_prepare() {
- sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf || die
- default
- use meson || {
- eautopoint
- eautoreconf
- }
+ sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf
+ epatch_user
+ eautopoint
+ eautoreconf
}
src_configure() {
- local i
- export LINGUAS=
- for i in ${PLOCALES}; do
- use l10n_${i} && LINGUAS+=${LINGUAS:+ }${i}
- done
- if use meson; then
- local emesonargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${P}"
- -Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html"
- $(meson_use jumbo-build)
- $(meson_use sqlite)
- $(meson_use protobuf)
- $(meson_use doc extra-doc)
- $(meson_use nls)
- $(meson_use tools separate-tools)
- $(meson_use security)
- $(meson_use optimization normal-optimization)
- $(meson_use strong-security)
- $(meson_use strong-optimization)
- $(meson_use debug debugging)
- $(meson_use swap-remote)
- $(meson_use prefix always-accept-keywords)
- $(meson_use cpu_flags_x86_sse2 sse2)
- $(meson_use dep dep-default)
- $(meson_use required-use required-use-default)
- $(meson_use src-uri src-uri-default)
- $(usex usr-portage -Dportdir-default=/usr/portage '')
- -Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions"
- -Dportage-rootpath="${ROOTPATH}"
- -Deprefix-default="${EPREFIX}"
- )
- if use prefix; then
- emesonarge+=(
- -Deix-user=
- -Deix-uid=-1
- )
- fi
- meson_src_configure
- else
- local myconf=(
- $(use_enable jumbo-build)
- $(use_with sqlite)
- $(use_with protobuf)
- $(use_with doc extra-doc)
- $(use_enable nls)
- $(use_enable tools separate-tools)
- $(use_enable security)
- $(use_enable optimization)
- $(use_enable strong-security)
- $(use_enable strong-optimization)
- $(use_enable debug debugging)
- $(use_enable swap-remote)
- $(use_with prefix always-accept-keywords)
- $(use_with cpu_flags_x86_sse2 sse2)
- $(use_with dep dep-default)
- $(use_with required-use required-use-default)
- $(use_with src-uri src-uri-default)
- $(use_with usr-portage portdir-default /usr/portage)
- --with-zsh-completion
- --with-portage-rootpath="${ROOTPATH}"
- --with-eprefix-default="${EPREFIX}"
- )
- if use prefix; then
- myconf+=(
- --with-eix-user=
- --with-eix-uid=-1
- )
- fi
- econf "${myconf[@]}"
- fi
-}
-
-src_compile() {
- if use meson; then
- meson_src_compile
- else
- default
- fi
-}
-
-src_test() {
- if use meson; then
- meson_src_test
- else
- default
- fi
+ econf $(use_with sqlite) $(use_with doc extra-doc) \
+ $(use_enable nls) $(use_enable tools separate-tools) \
+ $(use_enable security) $(use_enable optimization) \
+ $(use_enable strong-security) \
+ $(use_enable strong-optimization) $(use_enable debug debugging) \
+ $(use_enable swap-remote) \
+ $(use_with prefix always-accept-keywords) \
+ $(use_with dep dep-default) \
+ --with-zsh-completion \
+ --with-portage-rootpath="${ROOTPATH}" \
+ --with-eprefix-default="${EPREFIX}" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
}
src_install() {
- if use meson; then
- meson_src_install
- else
- default
- fi
+ default
dobashcomp bash/eix
- dotmpfiles tmpfiles.d/eix.conf
- use doc && dodoc src/output/eix.proto
+ insinto "/usr/lib/tmpfiles.d"
+ doins tmpfiles.d/eix.conf
}
pkg_postinst() {
+ test -d "${EROOT}var/cache/${PN}" || {
+ mkdir "${EROOT}var/cache/${PN}"
+ use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
+ }
local obs="${EROOT}var/cache/eix.previous"
- if test -f "${obs}"; then
- ewarn "Found obsolete ${obs}, please remove it"
- fi
- tmpfiles_process eix.conf
+ ! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
}
pkg_postrm() {
- if [ -z "${REPLACED_BY_VERSION}" ]; then
- rm -rf -- "${EROOT}var/cache/${PN}"
- fi
+ [ -n "${REPLACED_BY_VERSION}" ] || rm -rf -- "${EROOT}var/cache/${PN}"
}
diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml
index f59d4b2a..d1e91558 100644
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@@ -1,34 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <use>
- <flag name="debug">Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.</flag>
- <flag name="dep">Make DEP=true the default which enables support for {,R,P,B}DEPEND but requires roughly double disk and memory.</flag>
- <flag name="doc">Create description of the eix cache file additionally in html format</flag>
- <flag name="jumbo-build">Compile faster and produce better binary. Recommended unless compiling on a quite memory-restricted system.</flag>
- <flag name="meson">Build with meson instead of autotools. Faster but less compatible</flag>
- <flag name="optimization">Accept upstream's choices for CXXFLAGS/LDFLAGS for optimization. Absense of this USE flag does not strip user's *FLAGS</flag>
- <flag name="protobuf">Use dev-libs/protobuf to suport proto output with --proto</flag>
- <flag name="required-use">Make REQUIRED_USE=true the default which enables support for REQUIRED_USE but requires more disk and memory.</flag>
- <flag name="security">This adds some checks which can prevent certain exploits if e.g. the eix code has a bug. If you use the hardened toolchain, using this flag does not increase security and can even lead to problems.</flag>
- <flag name="sqlite">Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix</flag>
- <flag name="src-uri">Make SRC_URI=true the default which enables support for SRC_URI but requires roughly double disk and memory.</flag>
- <flag name="strong-optimization">Adds several more agressive CXXFLAGS/LDFLAGS for optimization like graphite (if available). May cause trouble with some buggy compiler versions. Absense of this USE flag does not strip user's *FLAGS</flag>
- <flag name="strong-security">Add many checks to prevent exploits if eix code has a bug. This will slow down eix considerably. Use only if you are paranoid or have reasons to suspect a bug.</flag>
- <flag name="swap-remote">Swap role of remote addresses in eix-remote, making the data from gpo.zugaina.org the first choice.</flag>
- <flag name="tools">Create separate binary for script helper tools; useful if they are called extremely often</flag>
- <flag name="usr-portage">Set last PORTDIR fallback to /usr/portage instead of /var/db/repos/gentoo</flag>
- </use>
- <upstream>
- <maintainer>
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <bugs-to>mailto:martin@mvath.de</bugs-to>
- <remote-id type="github">vaeth/eix</remote-id>
- </upstream>
+ <maintainer>
+ <email>martin@mvath.de</email>
+ <name>Martin Väth</name>
+ <description>Upstream developer, assign bugs</description>
+ </maintainer>
+ <maintainer>
+ <email>axs@gentoo.org</email>
+ <description>Proxy committer, CC bugs</description>
+ </maintainer>
+ <upstream>
+ <maintainer>
+ <email>martin@mvath.de</email>
+ <name>Martin Väth</name>
+ </maintainer>
+ <bugs-to>https://github.com/vaeth/eix/issues/</bugs-to>
+ <remote-id type="github">vaeth/eix</remote-id>
+ </upstream>
+ <use>
+ <flag name="debug">Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.</flag>
+ <flag name="dep">Make DEP=true the default which enables support for {,R,P}DEPEND but requires roughly double disk and memory.</flag>
+ <flag name="doc">Create description of the eix cache file additionally in html format</flag>
+ <flag name="optimization">Accept upstream's choices for CXXFLAGS/LDFLAGS for optimization. Absense of this USE flag does not strip user's *FLAGS</flag>
+ <flag name="security">This adds some checks which can prevent certain exploits if e.g. the eix code has a bug. If you use the hardened toolchain, using this flag does not increase security and can even lead to problems.</flag>
+ <flag name="strong-optimization">Adds several more agressive CXXFLAGS/LDFLAGS for optimization like graphite (if available). May cause trouble with some buggy compiler versions. Absense of this USE flag does not strip user's *FLAGS</flag>
+ <flag name="strong-security">Add many checks to prevent exploits if eix code has a bug. This will slow down eix considerably. Use only if you are paranoid or have reasons to suspect a bug.</flag>
+ <flag name="sqlite">Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix</flag>
+ <flag name="swap-remote">Swap role of remote addresses in eix-remote, making the data from gpo.zugaina.org the first choice.</flag>
+ <flag name="tools">Create separate binary for script helper tools; useful if they are called extremely often</flag>
+ </use>
</pkgmetadata>
diff --git a/app-portage/etcat/Manifest b/app-portage/etcat/Manifest
deleted file mode 100644
index c81e0462..00000000
--- a/app-portage/etcat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST etcat-1.0.2.tar.gz 40730 SHA512 3620742a0806ff23581aa20927c4df749d1942b682a5468e9882b269d1e9f27485d800f4f6cb256a979b1e9087414b7ee3f4e6351e0c5b961def914350d4d4ae
diff --git a/app-portage/etcat/etcat-1.0.2.ebuild b/app-portage/etcat/etcat-1.0.2.ebuild
deleted file mode 100644
index 36229c17..00000000
--- a/app-portage/etcat/etcat-1.0.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2016-2021 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-case ${PV} in
-99999999*)
- EGIT_REPO_URI="https://github.com/proteusx/${PN}.git"
- inherit git-r3
- PROPERTIES="live"
- KEYWORDS=""
- SRC_URI="";;
-*)
- RESTRICT="mirror"
- SRC_URI="https://github.com/proteusx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-esac
-inherit python-single-r1
-
-DESCRIPTION="Updated version of an old Portage information extractor"
-HOMEPAGE="https://github.com/proteusx/etcat/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=$(python_gen_cond_dep 'app-portage/gentoolkit[${PYTHON_MULTI_USEDEP}]')
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
- python_fix_shebang "${S}"
- default
-}
-
-src_install() {
- dobin "${PN}"
-}
diff --git a/app-portage/etcat/etcat-99999999.ebuild b/app-portage/etcat/etcat-99999999.ebuild
deleted file mode 100644
index 36229c17..00000000
--- a/app-portage/etcat/etcat-99999999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2016-2021 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-case ${PV} in
-99999999*)
- EGIT_REPO_URI="https://github.com/proteusx/${PN}.git"
- inherit git-r3
- PROPERTIES="live"
- KEYWORDS=""
- SRC_URI="";;
-*)
- RESTRICT="mirror"
- SRC_URI="https://github.com/proteusx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-esac
-inherit python-single-r1
-
-DESCRIPTION="Updated version of an old Portage information extractor"
-HOMEPAGE="https://github.com/proteusx/etcat/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=$(python_gen_cond_dep 'app-portage/gentoolkit[${PYTHON_MULTI_USEDEP}]')
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
- python_fix_shebang "${S}"
- default
-}
-
-src_install() {
- dobin "${PN}"
-}
diff --git a/app-portage/etcat/metadata.xml b/app-portage/etcat/metadata.xml
deleted file mode 100644
index e4206648..00000000
--- a/app-portage/etcat/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>proteuss@sdf.lonestar.org</email>
- <name>Andreas Proteus</name>
- </maintainer>
- <bugs-to>https://github.com/proteusx/etcat/issues</bugs-to>
- <remote-id type="github">proteusx/etcat</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-portage/find_cruft/ChangeLog b/app-portage/find_cruft/ChangeLog
new file mode 100644
index 00000000..2756dd4b
--- /dev/null
+++ b/app-portage/find_cruft/ChangeLog
@@ -0,0 +1,88 @@
+# ChangeLog for app-portage/find_cruft
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*find_cruft-3.0.7 (17 Mar 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Simplify tarball name
+
+ 17 Mar 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*find_cruft-3.0.6 (13 Nov 2014)
+
+ 13 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*find_cruft-3.0.5 (11 Nov 2014)
+
+ 11 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*find_cruft-3.0.4 (10 Nov 2014)
+
+ 10 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fixes severe regression of 3.0.1
+
+*find_cruft-3.0.3 (20 Sep 2014)
+
+ 20 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*find_cruft-3.0.1 (13 Sep 2014)
+
+ 13 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. More precise perl deps
+
+*find_cruft-3.0 (29 Aug 2014)
+
+ 29 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*find_cruft-2.4 (10 Feb 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 15 Mar 2014; Martin Väth <martin@mvath.de>:
+ Use optfeature
+
+ 01 Feb 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*find_cruft-2.3-r1 (17 Dec 2013)
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix perl path
+
+*find_cruft-2.3 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*find_cruft-2.2 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Shebang care
+
+*find_cruft-2.1 (21 Aug 2013)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 21 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*find_cruft-2.0 (18 May 2013)
+
+ 18 May 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Create /etc. Warn if eix is not installed
+
+ 10 Jun 2013; Martin Väth <martin@mvath.de>:
+ Improve eix message
+
+*find_cruft-1.0 (16 May 2013)
+
+ 16 May 2013; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/app-portage/find_cruft/Manifest b/app-portage/find_cruft/Manifest
index 63962ab3..51a7fc3b 100644
--- a/app-portage/find_cruft/Manifest
+++ b/app-portage/find_cruft/Manifest
@@ -1 +1 @@
-DIST find_cruft-5.2.tar.gz 11458 SHA512 fdfe0c4dd4700395b6f109ae520cd5fbf6f086353a4f4b769ea50017b81a934c99ec3093d11610970276dc4ce311b3584e2e06ce7e605fa995a13abe5683c910
+DIST find_cruft-3.0.7.tar.gz 10212 SHA256 d9acce43a8f0b7869c89c954117ae4590233e8f0aa824144e070ca02cab92efb SHA512 74852373901cb8f2c122b59d98f07f1d56fc3fea84433be65bc1d9cd602ca0444554bd407d10b2e8dc04836c5112866c43806cabe109dd62b577276a4c3f9103 WHIRLPOOL 29275a95130d9aff8a063b7047f556986f72c2004f12c5b013db7d230d66634eabee17b7358b26f1be42325e9ffa4e1bd289344896c60c0afae31b684e96f39c
diff --git a/app-portage/find_cruft/find_cruft-5.2.ebuild b/app-portage/find_cruft/find_cruft-3.0.7.ebuild
index 0f9fd1f1..6d7ca106 100644
--- a/app-portage/find_cruft/find_cruft-5.2.ebuild
+++ b/app-portage/find_cruft/find_cruft-3.0.7.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2013-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
-inherit optfeature
+inherit eutils
DESCRIPTION="find cruft files not managed by portage"
HOMEPAGE="https://github.com/vaeth/find_cruft/"
@@ -11,10 +12,10 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND=">=dev-lang/perl-5.8"
+RDEPEND=">=dev-lang/perl-5.12"
# || ( >=dev-lang/perl-5.9.4 >=virtual/perl-File-Spec-3.0 )
# || ( >=dev-lang/perl-5.6.1 >=virtual/perl-Getopt-Long-2.24 )
@@ -22,13 +23,13 @@ src_prepare() {
use prefix || sed -i \
-e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
-- bin/* || die
- default
+ epatch_user
}
src_install() {
dobin bin/*
- dodoc README.md
- insinto /usr/lib/find_cruft
+ dodoc README
+ insinto /etc
doins -r etc/*
insinto /usr/share/zsh/site-functions
doins zsh/_*
diff --git a/app-portage/find_cruft/metadata.xml b/app-portage/find_cruft/metadata.xml
index b408d25f..d66620e7 100644
--- a/app-portage/find_cruft/metadata.xml
+++ b/app-portage/find_cruft/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-portage/getdelta/ChangeLog b/app-portage/getdelta/ChangeLog
new file mode 100644
index 00000000..1377e76d
--- /dev/null
+++ b/app-portage/getdelta/ChangeLog
@@ -0,0 +1,60 @@
+# ChangeLog for app-portage/getdelta
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*getdelta-0.7.9-r2 (17 Mar 2013)
+
+ 24 Jan 2014; Martin Väth <martin@mvath.de>:
+ Avoid duplicate installation
+
+ 12 Oct 2013; Martin Väth <martin@mvath.de>:
+ Use readme.gentoo.eclass
+
+ 17 Mar 2012; Martin Väth <martin@mvath.de>:
+ Bump without any change to make clear our version is newer as in main tree
+
+*getdelta-0.7.9-r1 (21 Aug 2012)
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 21 Aug 2012; Martin Väth <martin@mvath.de>:
+ Upgrade revision without change to be not older than in portage tree
+
+*getdelta-0.7.9 (19 Mar 2012)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base.
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Upgrade according to version bump in main tree.
+
+*getdelta-0.7.8 (07 Apr 2010)
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 27 Sep 2010; Martin Väth <martin@mvath.de>:
+ Improve treatment of fetch errors. Bump to force upgrade.
+
+ 14 Sep 2010; Martin Väth <martin@mvath.de>:
+ Support alternative location of make.globals and both locations of make.conf
+ Bump to force upgrade.
+
+ 27 Aug 2010; Martin Väth <martin@mvath.de>:
+ Fix previous patch. Bump to force upgrade.
+
+ 26 Aug 2010; Martin Väth <martin@mvath.de>:
+ Use local name also for dtu file. Bump to force upgrade.
+
+ 30 Jun 2010; Martin Väth <martin@mvath.de>:
+ Fix typo in FETCHCOMMAND description
+
+ 29 Jun 2010; Martin Väth <martin@mvath.de>:
+ Bump to force upgrade.
+
+ 07 Apr 2010; Martin Väth <martin@mvath.de>:
+ Copy from the portage tree and add eapi2.patch; clear previous ChangeLog.
diff --git a/app-portage/getdelta/Manifest b/app-portage/getdelta/Manifest
index dfe42efd..df88baf5 100644
--- a/app-portage/getdelta/Manifest
+++ b/app-portage/getdelta/Manifest
@@ -1 +1 @@
-DIST getdelta-0.7.8.tar.bz2 10335 SHA512 66374ce1a0ec5492d11478ddcaeb67b497a44357605f3cd1b9176796ca9f69d8c6865f9db188a6d7722c4ab372a5a317dfa6fafe97d9f08f76f332469f1ee2b2
+DIST getdelta-0.7.8.tar.bz2 10335 SHA256 72bd5dac59e86a5c78217a15e3198df513152dc784a8685b1a8c2c5efdb34217 SHA512 66374ce1a0ec5492d11478ddcaeb67b497a44357605f3cd1b9176796ca9f69d8c6865f9db188a6d7722c4ab372a5a317dfa6fafe97d9f08f76f332469f1ee2b2 WHIRLPOOL 88e6f1df59e4897c3c667634b8d08c0a225daad56f627793074947b8f2bd3840b9108e50e0506fe49ca2ab43179d43c902f3da49a994b1886b855bb3cc65f395
diff --git a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
index 8d81a2e9..d36a85c5 100644
--- a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
+++ b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Martin V\"ath and others
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
-inherit readme.gentoo-r1
+EAPI=5
+inherit eutils readme.gentoo
DESCRIPTION="dynamic deltup client"
HOMEPAGE="http://linux01.gwdg.de/~nlissne/"
@@ -16,19 +17,19 @@ S="${WORKDIR}"
RDEPEND="app-portage/deltup
dev-util/bdelta"
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="You need to put
+FETCHCOMMAND=\"/usr/bin/getdelta.sh \\\"\\\${URI}\\\" \\\"\\\${FILE}\\\"\"
+into your /etc/make.conf to make use of getdelta"
+
src_prepare() {
- eapply "${FILESDIR}/eapi2.patch"
+ epatch "${FILESDIR}/eapi2.patch"
sed -i -e "s:/bin/sh:/bin/bash:" getdelta.sh || die
- default
+ epatch_user
}
src_install() {
- local DISABLE_AUTOFORMATTING DOC_CONTENTS
dobin "${WORKDIR}"/getdelta.sh
- DISABLE_AUTOFORMATTING="true"
- DOC_CONTENTS="You need to put
-FETCHCOMMAND=\"/usr/bin/getdelta.sh \\\"\\\${URI}\\\" \\\"\\\${FILE}\\\"\"
-into your /etc/make.conf to make use of getdelta"
readme.gentoo_create_doc
}
@@ -41,5 +42,5 @@ pkg_postinst() {
mkdir -p -- "${b}"
use prefix || chown -R portage:portage -- "${a}" "${b}"
chmod -R ug+rwX -- "${a}" "${b}"
- readme.gentoo_print_elog
+ readme.gentoo_pkg_postinst
}
diff --git a/app-portage/getdelta/metadata.xml b/app-portage/getdelta/metadata.xml
index 9550c8c1..cd5e732e 100644
--- a/app-portage/getdelta/metadata.xml
+++ b/app-portage/getdelta/metadata.xml
@@ -1,21 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- <description>maintainer of the updates in the mv overlay</description>
- </maintainer>
- <maintainer type="person">
- <email>patrick@gentoo.org</email>
- <name>Patrick Lauer</name>
- </maintainer>
- <maintainer type="person">
- <email>nlissne@linux01.gwdg.de</email>
- <name>Nicolai Lissner</name>
- </maintainer>
-<maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <maintainer>
+ <email>martin@mvath.de</email>
+ <name>Martin Väth</name>
+ <description>maintainer of the updates in the mv overlay</description>
+ </maintainer>
+ <maintainer>
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+ <maintainer>
+ <email>nlissne@linux01.gwdg.de</email>
+ <name>Nicolai Lissner</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-portage/logclean/ChangeLog b/app-portage/logclean/ChangeLog
new file mode 100644
index 00000000..9e3c3e97
--- /dev/null
+++ b/app-portage/logclean/ChangeLog
@@ -0,0 +1,112 @@
+# ChangeLog for app-portage/logclean
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*logclean-9.8-r1 (17 Dec 2013)
+
+ 13 Sep 2014; Martin Väth <martin@mvath.de>:
+ More precise perl deps
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 15 Mar 2014; Martin Väth <martin@mvath.de>:
+ Use optfeature
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix perl path
+
+*logclean-9.8 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*logclean-9.7 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Shebang care
+
+*logclean-9.6 (10 Sep 2013)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support uncoloring of logfiles
+ Install zsh-completion unconditionally according to gentoo policy
+
+*logclean-9.4 (18 Aug 2013)
+
+ 18 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*logclean-9.3 (21 Apr 2013)
+
+ 21 Apr 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+ 10 Jun 2013; Martin Väth <martin@mvath.de>:
+ Improve eix message
+
+*logclean-9.0 (20 Apr 2013)
+
+ 20 Apr 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Added ability to cleanup emerge.log
+
+*logclean-8.3 (28 Jan 2013)
+
+ 28 Jan 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*logclean-8.2 (11 Nov 2012)
+
+ 01 Dev 2012; Martin Väth <martin@mvath.de>:
+ Remove USE=eix; only log recommendation if appropriate
+
+ 11 Nov 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*logclean-8.1 (31 May 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 31 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*logclean-8.0 (31 May 2012)
+
+ 31 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Introduce configuration file to specify
+ which logs should be shortened. (Now --shorten is used differently.)
+
+*logclean-7.8 (26 May 2012)
+
+ 27 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Introduce --shorten
+
+*logclean-7.7 (07 Jan 2012)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 09 Jan 2012; Martin Väth <martin@mvath.de>:
+ Depend of virtual/perl-Getopt-Long
+
+ 08 Jan 2012; Martin Väth <martin@mvath.de>:
+ Move category: app-admin -> app-portage
+
+ 07 Jan 2012; Martin Väth <martin@mvath.de>:
+ Version bump. Make help handling more consistent. Fix dependencies.
+
+*logclean-7.6 (21 Dec 2011)
+
+ 21 Nov 2011; Martin Väth <martin@mvath.de>:
+ Suppose IUSE=eix
+
+ 21 Nov 2011; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch.
+
diff --git a/app-portage/logclean/Manifest b/app-portage/logclean/Manifest
index d9e68d4a..4b108640 100644
--- a/app-portage/logclean/Manifest
+++ b/app-portage/logclean/Manifest
@@ -1 +1 @@
-DIST logclean-18.4.1.tar.gz 15034 SHA512 0dc19c7a967794a09fa3a371fd6ade5a874ac702c60c0c208cab031c3713863a597aab3003d76868ea0c55b737da77ea25186bd8c7f4af11fd86fc1033d59383
+DIST logclean-9.8.tar.gz 11335 SHA256 2c37a4edceb97a828afbb179bb109ecc905531400bb6a2cd38f9fa109d708628 SHA512 1c9dc6d458be711cb5c37ccfd13c0584b1499365111a4cd0bee171bbe12b9bf7eeab55d8f9a7caf22cdb9d5b2e6a49855ac9097577cca35533bc7ef38f09312a WHIRLPOOL 40d6a5d072720b5335802a67c1b1f441da414ed0e1dc9939604f65110fc8a1680b51348e2b4cb6f70ad11488fa220f12c0e0350a7a331b2475250d43f822385f
diff --git a/app-portage/logclean/logclean-18.4.1.ebuild b/app-portage/logclean/logclean-18.4.1.ebuild
deleted file mode 100644
index 210bfca2..00000000
--- a/app-portage/logclean/logclean-18.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2011-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-inherit optfeature
-
-DESCRIPTION="Keep only (compressed) logs of installed packages and cleanup emerge.log"
-HOMEPAGE="https://github.com/vaeth/logclean/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# This should really depend on a USE-flag but must not by policy.
-# Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283
-OPTIONAL_RDEPEND="dev-perl/File-Which"
-
-RDEPEND=">=dev-lang/perl-5.8
- dev-perl/String-ShellQuote
- || ( >=dev-lang/perl-5.14 virtual/perl-Term-ANSIColor )
- ${OPTIONAL_RDEPEND}"
-# || ( >=dev-lang/perl-5.6.1 >=virtual/perl-Getopt-Long-2.24 )
-
-src_prepare() {
- use prefix || sed -i \
- -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
- -- bin/* || die
- default
-}
-
-src_install() {
- dodoc README.md
- dobin bin/*
- insinto /etc
- doins etc/*
- insinto /usr/share/zsh/site-functions
- doins zsh/*
-}
-
-pkg_postinst() {
- optfeature "faster execution" 'app-portage/eix'
-}
diff --git a/app-portage/logclean/logclean-9.8-r1.ebuild b/app-portage/logclean/logclean-9.8-r1.ebuild
new file mode 100644
index 00000000..e04173b4
--- /dev/null
+++ b/app-portage/logclean/logclean-9.8-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils
+
+DESCRIPTION="Keep only (compressed) logs of installed packages and cleanup emerge.log"
+HOMEPAGE="https://github.com/vaeth/logclean/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+ || ( >=dev-lang/perl-5.14 virtual/perl-Term-ANSIColor )
+ || ( >=dev-lang/perl-5.6.1 >=virtual/perl-Getopt-Long-2.24 )"
+
+src_prepare() {
+ use prefix || sed -i \
+ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
+ -- "${PN}" || die
+ epatch_user
+}
+
+src_install() {
+ dobin "${PN}"
+ insinto /etc
+ doins "${PN}.conf"
+ insinto /usr/share/zsh/site-functions
+ doins "_${PN}"
+}
+
+pkg_postinst() {
+ optfeature "faster execution" 'app-portage/eix'
+}
diff --git a/app-portage/logclean/metadata.xml b/app-portage/logclean/metadata.xml
index d2834dca..7d030fd7 100644
--- a/app-portage/logclean/metadata.xml
+++ b/app-portage/logclean/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-portage/portage-bashrc-mv/ChangeLog b/app-portage/portage-bashrc-mv/ChangeLog
new file mode 100644
index 00000000..ebb7e511
--- /dev/null
+++ b/app-portage/portage-bashrc-mv/ChangeLog
@@ -0,0 +1,185 @@
+# ChangeLog for app-portage/portage-bashrc-mv
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*portage-bashrc-mv-13.6 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-13.5 (14 Jun 2015)
+
+ 14 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-13.4 (11 Jun 2015)
+
+ 11 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-13.3 (07 Jun 2015)
+
+ 07 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-13.2 (04 Mar 2015)
+
+ 04 Mar 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-13.1 (02 Mar 2015)
+
+ 02 Mar 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-13.0 (04 Dec 2014)
+
+ 04 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix compatibility with >=portage-2.2.15
+
+*portage-bashrc-mv-12.6 (20 Nov 2014)
+
+ 20 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support ccache-3.2
+
+*portage-bashrc-mv-12.5 (21 Nov 2013)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 15 Mar 2014; Martin Väth <martin@mvath.de>:
+ Use optfeature
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-12.4 (01 Nov 2013)
+
+ 01 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-12.3 (15 Sep 2013)
+
+ 15 Sep 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-12.2 (27 Jul 2013)
+
+ 27 Jul 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-12.1 (13 Jul 2013)
+
+ 13 Jul 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-12.0 (04 Nov 2012)
+
+ 01 Dev 2012; Martin Väth <martin@mvath.de>:
+ Remove USE=eix; only log recommendation if appropriate
+
+ 04 Nov 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Globally rename GPO->PGO, gpo->pgo
+
+*portage-bashrc-mv-11.7 (13 Oct 2012)
+
+ 13 Oct 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Parse first line in cflags correctly
+
+*portage-bashrc-mv-11.6 (07 Oct 2012)
+
+ 07 Oct 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-11.5 (07 Oct 2012)
+
+ 07 Oct 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support gpo
+
+*portage-bashrc-mv-11.4 (10 Sep 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 10 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Rely that gold linker is used with clang:
+ Do not filter -flto for USE_NONGNU
+
+*portage-bashrc-mv-11.3 (08 Sep 2012)
+
+ 08 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support for Non-GNU compilers (e.g. clang)
+
+*portage-bashrc-mv-11.2 (08 Sep 2012)
+
+ 08 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fixes CCACHE_*
+
+*portage-bashrc-mv-11.1 (07 Sep 2012)
+
+ 07 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support for CCACHE_*
+
+*portage-bashrc-mv-11.0 (16 Jun 2012)
+
+ 16 Jun 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Use masked-packages from app-portage/eix
+
+*portage-bashrc-mv-10.12 (21 May 2012)
+
+ 21 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-10.11 (20 May 2012)
+
+ 20 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-10.9 (11 May 2012)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 11 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-10.8 (07 May 2012)
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-10.7 (08 Apr 2012)
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 08 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-10.6 (13 Mar 2012)
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass, remove old ebuild
+
+ 13 Mar 2012; Martin Väth <martin@mvath.de>:
+ Version bump. Keep old ebuild, since release is experimental
+
+*portage-bashrc-mv-10.3 (28 Feb 2012)
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-10.2 (19 Feb 2012)
+
+ 19 Jan 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support CPPFLAGS
+
+*portage-bashrc-mv-10.1 (06 Jan 2012)
+
+ 06 Jan 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*portage-bashrc-mv-10.0 (19 Dec 2011)
+
+ 19 Nov 2011; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/app-portage/portage-bashrc-mv/Manifest b/app-portage/portage-bashrc-mv/Manifest
index c6f7f0f4..bea7a509 100644
--- a/app-portage/portage-bashrc-mv/Manifest
+++ b/app-portage/portage-bashrc-mv/Manifest
@@ -1 +1 @@
-DIST portage-bashrc-mv-20.3.tar.gz 19808 SHA512 31292e38cfb9d37b972c6eda503d8c1b4455bfe5481fac562f41101f4d195550d35a287421bac97364e481ffeda2ff36e08bc17f1b6c2915559adefca1e0719e
+DIST portage-bashrc-mv-13.6.tar.gz 13566 SHA256 73971b99567b292c9d00612959c73f0241ee42fc2d7689b8f6926aa8d4f0121b SHA512 19fc82395e804c708b08e130a2fe8ee896fa9c6fe44ccdeb6dc15bfcabc311a0aac8c18554d13e14172c54a0805c37d36bdd68490d9a93e11f082b49fab2b192 WHIRLPOOL 2c26b743725e4bcd1fa4ed50e635ee60c3464bc4ed670859d7ecd79730deb5227d16ab47a24105d1f78011e7e700e6a8cb49bdac12afb825e245a61302adcabe
diff --git a/app-portage/portage-bashrc-mv/metadata.xml b/app-portage/portage-bashrc-mv/metadata.xml
index dcf7359a..cb260f08 100644
--- a/app-portage/portage-bashrc-mv/metadata.xml
+++ b/app-portage/portage-bashrc-mv/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
@@ -13,10 +13,4 @@
<bugs-to>mailto:martin@mvath.de</bugs-to>
<remote-id type="github">vaeth/portage-bashrc-mv</remote-id>
</upstream>
- <use>
- <flag name="ccache">Install a script for CCACHE_* variable support. This requires dev-util/ccache</flag>
- <flag name="cflags">Install a script for /etc/portage/package.cflags support. Requires app-portage/eix for fast parsing</flag>
- <flag name="remove-la">Install a script to remove unneeded .ls files</flag>
- <flag name="title">Install a script to display the expected merge time. Requires app-portage/portage-utils and app-shells/runtitle</flag>
- </use>
</pkgmetadata>
diff --git a/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.6.ebuild b/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.6.ebuild
new file mode 100644
index 00000000..a112f8df
--- /dev/null
+++ b/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils
+
+DESCRIPTION="Provide support for /etc/portage/bashrc.d and /etc/portage/package.cflags"
+HOMEPAGE="https://github.com/vaeth/portage-bashrc-mv/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="!<dev-util/ccache-3.2"
+
+src_prepare() {
+ epatch_user
+}
+
+src_install() {
+ dodoc NEWS README
+ exeinto "/usr/share/doc/${PF}"
+ doexe fix-portage-2.2.15
+ docompress -x "/usr/share/doc/${PF}/fix-portage-2.2.15"
+ insinto /etc/portage
+ doins -r bashrc bashrc.d
+ docompress /etc/portage/bashrc.d/README
+}
+
+pkg_postinst() {
+ case ${REPLACING_VERSIONS} in
+ [0-9].*|1[0-2].*)
+ ewarn "Remember to run /usr/share/doc/${PF}/fix-portage-2.2.15"
+ ewarn "as the first command after upgrading to >=portage-2.2.15"
+ ewarn "See NEWS for details";;
+ esac
+ optfeature "improved mask handling" app-portage/eix
+ optfeature "output of expected emerge time" app-portage/portage-utils
+ optfeature "detailed information output in title bar" app-shells/runtitle
+ ! test -d /var/cache/gpo || \
+ ewarn "Obsolete /var/cache/gpo found. Please remove"
+}
diff --git a/app-portage/portage-bashrc-mv/portage-bashrc-mv-20.3.ebuild b/app-portage/portage-bashrc-mv/portage-bashrc-mv-20.3.ebuild
deleted file mode 100644
index 28de13b5..00000000
--- a/app-portage/portage-bashrc-mv/portage-bashrc-mv-20.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2011-2021 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="Provide support for /etc/portage/bashrc.d and /etc/portage/package.cflags"
-HOMEPAGE="https://github.com/vaeth/portage-bashrc-mv/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+ccache +cflags +remove-la +title"
-
-# the ccache script would run without dev-util/ccache but would be pointless:
-RDEPEND="ccache? ( >=dev-util/ccache-3.2 )"
-
-# The flags script would run without app-portage/eix, but package.cflags
-# parsing would be much slower (and is almost not tested):
-RDEPEND=${RDEPEND}" cflags? ( app-portage/eix )"
-
-# The title script would do nothing without these packages:
-RDEPEND=${RDEPEND}" title? (
- >=app-portage/portage-utils-0.80_pre20190605
- app-shells/runtitle
-)"
-
-src_install() {
- dodoc AUTHORS NEWS README.md
- exeinto "/usr/share/doc/${PF}"
- doexe fix-portage-2.2.15
- docompress -x "/usr/share/doc/${PF}/fix-portage-2.2.15"
- insinto /etc/portage
- doins -r bashrc
- insinto /etc/portage/bashrc.d
- doins bashrc.d/[a-zA-Z]*
- docompress /etc/portage/bashrc.d/README
- ! use ccache || doins bashrc.d/*ccache*
- ! use cflags || doins bashrc.d/*flag*
- doins bashrc.d/*locale*purge*
- ! use remove-la || doins bashrc.d/*remove*la*
- ! use title || doins bashrc.d/*title*
-}
-
-pkg_postinst() {
- case " ${REPLACING_VERSIONS}" in
- *' '[0-9].*|*' '1[0-2].*)
- ewarn "Remember to run /usr/share/doc/${PF}/fix-portage-2.2.15"
- ewarn "as the first command after upgrading to >=portage-2.2.15"
- ewarn "See NEWS for details";;
- esac
- ! test -d /var/cache/gpo || \
- ewarn "Obsolete /var/cache/gpo found. Please remove"
-}
diff --git a/app-portage/portage-postsyncd-mv/Manifest b/app-portage/portage-postsyncd-mv/Manifest
deleted file mode 100644
index 18824e0b..00000000
--- a/app-portage/portage-postsyncd-mv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST portage-postsyncd-mv-8.4.tar.gz 17480 SHA512 032faaae3fef44f2883337cad3da6919da1a31859c53c2525289f073d0697a1a1c8e700b20af214a4d7acb98c47fefe606ed5a5e57b50ff1c64ffdd867a0bcdf
diff --git a/app-portage/portage-postsyncd-mv/metadata.xml b/app-portage/portage-postsyncd-mv/metadata.xml
deleted file mode 100644
index 20517ee0..00000000
--- a/app-portage/portage-postsyncd-mv/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <bugs-to>mailto:martin@mvath.de</bugs-to>
- <remote-id type="github">vaeth/portage-postsyncd-mv</remote-id>
- </upstream>
- <use>
- <flag name="portage-utils">Make /etc/portage/repo.postsync.d/q-reinit from <pkg>app-portage/portage-utils</pkg> non-executable and install a hack in /etc/portage/env/app-portage/portage-utils so that it stays so</flag>
- </use>
-</pkgmetadata>
diff --git a/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-8.4.ebuild b/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-8.4.ebuild
deleted file mode 100644
index 0ef94487..00000000
--- a/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-8.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2016-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-inherit optfeature
-
-DESCRIPTION="postsync hooks for portage to sync from git"
-HOMEPAGE="https://github.com/vaeth/portage-postsyncd-mv/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# These should really depend on USE-flags but must not by policy.
-# Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283
-OPTIONAL_RDEPEND="dev-perl/File-Which
-dev-perl/String-ShellQuote"
-
-RDEPEND=">=dev-lang/perl-5.6.1
-!<app-portage/portage-utils-0.80_pre20190605
-${OPTIONAL_RDEPEND}"
-# || ( >=dev-lang/perl-5.6.1 >=virtual/perl-Getopt-Long-2.24 )
-
-src_prepare() {
- use prefix || {
- sed -i \
- -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
- -- repo.postsync.d/[0-9]* || die
- sed -i \
- -e '1s"^#!/usr/bin/env "#!'"${EPREFIX}/usr/bin/"'"' \
- -- bin/* || die
- }
- default
-}
-
-src_install() {
- exeinto /usr/bin
- doexe bin/*
- dodoc README.md ChangeLog
- insinto /etc/portage/repo.postsync.d
- doins repo.postsync.d/*.sh repo.postsync.d/README
- docompress /etc/portage/repo.postsync.d/README
- insinto /usr/share/zsh/site-functions
- doins zsh/*
- exeinto /etc/portage/repo.postsync.d
- doexe repo.postsync.d/[0-9]*
-}
-
-pkg_postinst() {
- case " ${REPLACING_VERSIONS}" in
- *' '[01].*)
- ewarn "The previous versions of $PN had several bugs."
- ewarn 'It is recommended to remove from $PORTDIR/metadata the directories'
- ewarn ' dtd/ glsa/ news/ xml-schema/'
- ewarn 'as well as the directory $PORTDIR/local/timestamps'
- ewarn 'to make sure that these directories contain the correct content.'
- ewarn 'Moreover:';;
- esac
- case " ${REPLACING_VERSIONS}" in
- *' '[0-3].*)
- ewarn "The previous versions of $PN cleaned too aggressively."
- ewarn 'It is recommended to refetch all repositories.'
- ewarn 'Also remove the files'
- ewarn ' $PORTDIR/local/timestamp/git-gc.date'
- ewarn ' $REPO/.git/git-gc.date'
- ewarn 'where $PORTDIR and $REPO should be replaced by the paths to'
- ewarn 'your main repository or to each of your overlays, respectively.'
- ewarn 'Also note renaming of some configuration variables.'
- ewarn 'See the new ChangeLog file for details';;
- esac
- optfeature "faster execution" 'app-portage/eix'
-}
diff --git a/app-portage/trickyfetch/ChangeLog b/app-portage/trickyfetch/ChangeLog
new file mode 100644
index 00000000..1ea60e27
--- /dev/null
+++ b/app-portage/trickyfetch/ChangeLog
@@ -0,0 +1,145 @@
+# ChangeLog for app-portage/trickyfetch
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*trickyfetch-8.7 (12 Jul 2015)
+
+ 12 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*trickyfetch-8.5 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*trickyfetch-8.4 (20 Jul 2014)
+
+ 20 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*trickyfetch-8.3-r1 (17 Dec 2013)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 15 Mar 2014; Martin Väth <martin@mvath.de>:
+ Use optfeature
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix sh path
+
+*trickyfetch-8.3 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*trickyfetch-8.2 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Shebang care
+
+*trickyfetch-8.1 (28 Jan 2013)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 14 Aug 2013; Martin Väth <martin@mvath.de>:
+ Simplify EPREFIX (without revision bump)
+
+ 28 Jan 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+ 10 Jun 2013; Martin Väth <martin@mvath.de>:
+ Improve eix message
+
+*trickyfetch-8.0 (21 Jan 2013)
+
+ 21 Jan 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+ Support /etc/trickyfetch.conf instead of IUSE=getdelta
+
+*trickyfetch-7.3 (25 Nov 2012)
+
+ 01 Dev 2012; Martin Väth <martin@mvath.de>:
+ Remove USE=eix; only log recommendation if appropriate
+
+ 25 Nov 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Make getdelta support optional
+
+*trickyfetch-7.2 (11 Nov 2012)
+
+ 11 Nov 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*trickyfetch-7.1 (23 Aug 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 23 Aug 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*trickyfetch-7.0 (16 Jun 2012)
+
+ 16 Jun 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Make NODELTA a masklist. Support
+ DELTA_EXCLUDE. Do not call getdelta on later mirrors. Quicker with eix.
+
+*trickyfetch-6.9 (09 Jun 2012)
+
+ 09 Jun 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*trickyfetch-6.8 (07 May 2012)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*trickyfetch-6.7 (04 May 2012)
+
+ 04 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*trickyfetch-6.6 (19 Apr 2012)
+
+ 19 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*trickyfetch-6.5 (08 Apr 2012)
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 08 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*trickyfetch-6.4 (05 Apr 2012)
+
+ 05 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*trickyfetch-6.3 (12 Mar 2012)
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 12 Mar 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*trickyfetch-6.2 (28 Feb 2012)
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*trickyfetch-6.1 (08 Jan 2012)
+
+ 08 Jan 2012; Martin Väth <martin@mvath.de>:
+ Version bump. Never proceed after LOCALFETCHCOMMAND.
+
+*trickyfetch-6.0 (06 Jan 2012)
+
+ 06 Jan 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch.
diff --git a/app-portage/trickyfetch/Manifest b/app-portage/trickyfetch/Manifest
index 349a1117..47df5fc8 100644
--- a/app-portage/trickyfetch/Manifest
+++ b/app-portage/trickyfetch/Manifest
@@ -1 +1 @@
-DIST trickyfetch-10.1.tar.gz 11487 SHA512 9583161aedddfbd21e2b4a5ce04404b6416bcf2736e0596588dae2c6a7f3f28f6dd9b599f724deac9ba626911167047cf7f61f657a42c962893abea5402e97e7
+DIST trickyfetch-8.7.tar.gz 10933 SHA256 d830b83a10fd70ce0718c384b10cfd07a742abbd3b3ae44afabf8c3c6f6a4753 SHA512 81401826f1fe3523aec247980b6631e07b48edb94d628a9154a16a309f237ed695ff394f735b4f6587d51478197b1e8b120156dc214146f2f9abd41fcd308c03 WHIRLPOOL 8a81d7921e6c55ca8e2f134bdd52cd24958e79020dfae881b11b601bbb1c00b887b6474910b158d728f3902efaa84dc7f128d2dac84fcf9eec5ce0910c1dd519
diff --git a/app-portage/trickyfetch/metadata.xml b/app-portage/trickyfetch/metadata.xml
index 46f3c59f..379e730b 100644
--- a/app-portage/trickyfetch/metadata.xml
+++ b/app-portage/trickyfetch/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-portage/trickyfetch/trickyfetch-10.1.ebuild b/app-portage/trickyfetch/trickyfetch-8.7.ebuild
index 62156be3..1a58aab1 100644
--- a/app-portage/trickyfetch/trickyfetch-10.1.ebuild
+++ b/app-portage/trickyfetch/trickyfetch-8.7.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2012-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
-inherit optfeature
+inherit eutils
DESCRIPTION="Plugin for FETCHCOMMAND to help organize and cleanup your DISTDIR"
HOMEPAGE="https://github.com/vaeth/trickyfetch/"
@@ -11,7 +12,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE=""
src_prepare() {
@@ -23,7 +24,7 @@ src_prepare() {
-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-- "${S}"/bin/* || die
fi
- default
+ epatch_user
}
src_install() {
@@ -32,7 +33,7 @@ src_install() {
doins etc/*
insinto /usr/share/zsh/site-functions
doins zsh/_*
- dodoc README.md THANKS
+ dodoc README
}
pkg_postinst() {
@@ -40,5 +41,5 @@ pkg_postinst() {
' '[0-7].*)
elog "Please adapt /etc/trickyfetch.conf to your needs";;
esac
- optfeature "faster execution" '>=app-portage/eix-0.32.2'
+ optfeature "faster execution" 'app-portage/eix'
}
diff --git a/app-portage/useflags/ChangeLog b/app-portage/useflags/ChangeLog
new file mode 100644
index 00000000..564e02a8
--- /dev/null
+++ b/app-portage/useflags/ChangeLog
@@ -0,0 +1,89 @@
+# ChangeLog for app-admin/useflags
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*useflags-3.4 (01 Feb 2014)
+
+ 13 Sep 2014; Martin Väth <martin@mvath.de>:
+ More precise perl deps
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 15 Mar 2014; Martin Väth <martin@mvath.de>:
+ Use optfeature
+
+ 01 Feb 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*useflags-3.3-r1 (17 Dec 2013)
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix perl path
+
+*useflags-3.3 (21 Nov 2013)
+
+ 21 Jan 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*useflags-3.2 (02 Nov 2013)
+
+ 02 Jan 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Shebang care
+
+*useflags-3.1 (28 Jan 2013)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 28 Jan 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*useflags-3.0 (28 Dec 2012)
+
+ 28 Dev 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Recommend >=app-portage/eix-0.27.7
+
+*useflags-2.8 (11 Nov 2012)
+
+ 01 Dev 2012; Martin Väth <martin@mvath.de>:
+ Remove USE=eix; only log recommendation if appropriate
+
+ 11 Nov 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*useflags-2.7 (15 Oct 2012)
+
+ 15 Oct 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*useflags-2.6 (08 Jan 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 09 Jan 2012; Martin Väth <martin@mvath.de>:
+ Depend of virtual/perl-Getopt-Long
+
+ 08 Jan 2012; Martin Väth <martin@mvath.de>:
+ Version bump: Make help handling more consistent.
+
+*useflags-2.5 (21 Dec 2011)
+
+ 07 Jan 2012; Martin Väth <martin@mvath.de>:
+ Fix dependencies
+
+ 21 Nov 2011; Martin Väth <martin@mvath.de>:
+ Suppose IUSE=eix
+
+ 21 Nov 2011; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch.
diff --git a/app-portage/useflags/Manifest b/app-portage/useflags/Manifest
index 10b47775..83f6e133 100644
--- a/app-portage/useflags/Manifest
+++ b/app-portage/useflags/Manifest
@@ -1 +1 @@
-DIST useflags-4.2.tar.gz 6748 SHA512 bbcef6a2df487bfae7cf78ff4150ea4eabaf3d78728a6d7d808cdad015b5329bf4a74a807ff5bfb8dbf149e05860f4297dc2e681af7e8bcd3812352ad290f42a
+DIST useflags-3.4.tar.gz 5328 SHA256 d12577f0ba6d5e8853c1e4bdb9589f903de09da5bb249b54a4452062ed25f921 SHA512 1a9e392f83eade3d0a2dd86765fe0289a740aa9d5ec633a857c753778bd3223feb8f2ca1dc623b6109bbef71072087f8068565c90224a3d17a84657de85f26e8 WHIRLPOOL 4087460721cb108eb4ea5f364cc7f5697511d5187fe6bb77d3a6a5ac783b92ec09c07d87e12c79948eee1a7d91ae7aebb8ab575ea507bd2f2b43b05367ad60fd
diff --git a/app-portage/useflags/metadata.xml b/app-portage/useflags/metadata.xml
index 2a199ebc..4e3965d1 100644
--- a/app-portage/useflags/metadata.xml
+++ b/app-portage/useflags/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-portage/useflags/useflags-3.4.ebuild b/app-portage/useflags/useflags-3.4.ebuild
new file mode 100644
index 00000000..2d4a2bf7
--- /dev/null
+++ b/app-portage/useflags/useflags-3.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils
+
+DESCRIPTION="Print or save the current USE-flag state and compare with older versions"
+HOMEPAGE="https://github.com/vaeth/useflags/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+ || ( >=dev-lang/perl-5.6.1 >=virtual/perl-Getopt-Long-2.24 )"
+
+src_prepare() {
+ use prefix || sed -i \
+ -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
+ -- "${PN}" || die
+ epatch_user
+}
+
+src_install() {
+ dobin "${PN}"
+ insinto /usr/share/zsh/site-functions
+ doins "_${PN}"
+}
+
+pkg_postinst() {
+ optfeature "faster execution" 'app-portage/eix'
+ optfeature "increased security" '>=app-portage/eix-0.27.7'
+}
diff --git a/app-portage/useflags/useflags-4.2.ebuild b/app-portage/useflags/useflags-4.2.ebuild
deleted file mode 100644
index 25845572..00000000
--- a/app-portage/useflags/useflags-4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2011-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="Print or save the current USE-flag state and compare with older versions"
-HOMEPAGE="https://github.com/vaeth/useflags/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# These should really depend on USE-flags but must not by policy.
-# Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283
-OPTIONAL_RDEPEND="dev-perl/File-Which
-dev-perl/String-ShellQuote"
-
-RDEPEND=">=app-portage/eix-0.34.7
- >=dev-lang/perl-5.6.1
- ${OPTIONAL_RDEPEND}"
-# || ( >=dev-lang/perl-5.6.1 >=virtual/perl-Getopt-Long-2.24 )"
-
-src_prepare() {
- use prefix || sed -i \
- -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
- -- bin/* || die
- default
-}
-
-src_install() {
- dobin bin/*
- insinto /usr/share/zsh/site-functions
- doins zsh/*
-}
diff --git a/app-portage/world-mv/ChangeLog b/app-portage/world-mv/ChangeLog
new file mode 100644
index 00000000..c5b3052e
--- /dev/null
+++ b/app-portage/world-mv/ChangeLog
@@ -0,0 +1,102 @@
+# ChangeLog for app-portage/world-mv
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*world-mv-3.14 (12 Jul 2015)
+
+ 12 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*world-mv-3.13 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*world-mv-3.12-r1 (17 Nov 2013)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix sh path
+
+*world-mv-3.12 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*world-mv-3.11 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Shebang care
+
+*world-mv-3.10 (11 Nov 2012)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 11 Nov 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*world-mv-3.9 (06 Sep 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 06 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*world-mv-3.8 (07 May 2012)
+
+ 16 Jul 2012; Martin Väth <martin@mvath.de>:
+ Fix for changed vcs-snapshot.eclass behavior
+ Thanks to Chris Slycord <cslycord at gmail.com> for reporting
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix EPREFIX substitution
+
+*world-mv-3.7 (20 Apr 2012)
+
+ 20 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix EPREFIX substitution
+
+*world-mv-3.6 (08 Apr 2012)
+
+ 08 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*world-mv-3.5 (28 Feb 2012)
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*world-mv-3.4 (05 Feb 2012)
+
+ 05 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*world-mv-3.3 (03 Feb 2012)
+
+ 03 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump; POSIX compatible. Do not install README
+
+*world-mv-3.2 (15 Jan 2012)
+
+ 15 Jan 2012; Martin Väth <martin@mvath.de>:
+ Version bump to provide grep/sgrep
+
+*world-mv-3.1 (08 Jan 2012)
+
+ 08 Jan 2012; Martin Väth <martin@mvath.de>:
+ Version bump to improve output for copying/skipping
+
+*world-mv-3.0 (07 Jan 2012)
+
+ 07 Jan 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/app-portage/world-mv/Manifest b/app-portage/world-mv/Manifest
index 608c1d19..25e8b273 100644
--- a/app-portage/world-mv/Manifest
+++ b/app-portage/world-mv/Manifest
@@ -1 +1 @@
-DIST world-3.20.tar.gz 3656 SHA512 53fb8c52356e34acbd15a595d5e345c9a5d3ae8fcc47d5190e44acc75492419ac0117a269d5440d40077a84b3b3e125baa5d0761f634574282fe5f2addbb236c
+DIST world-mv-3.14.tar.gz 3480 SHA256 e81e5ffaf6f4d9403e2b87d4fb55ea298e4b0cda1e05ae3e6d1edc7396d894f1 SHA512 8350c1f2f5213ceac326e41c1652708317e510b4ff007a7a0e35af112307d7978491c3eaf518df6d35e28f699e13a31079a666340e5ef663b20cc53400cbaf98 WHIRLPOOL 2ca466368424fc72c7657146de8bb9137754a329a29648297e3fa2b2e6773cbd1a7618196b564c095cbb4930caa8b38e27c2b6b60b1ee60cd7f8d27a312bb8cc
diff --git a/app-portage/world-mv/metadata.xml b/app-portage/world-mv/metadata.xml
index 1311ab80..8ba273b2 100644
--- a/app-portage/world-mv/metadata.xml
+++ b/app-portage/world-mv/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-portage/world-mv/world-mv-3.20.ebuild b/app-portage/world-mv/world-mv-3.14.ebuild
index 05b645b8..d1eff415 100644
--- a/app-portage/world-mv/world-mv-3.20.ebuild
+++ b/app-portage/world-mv/world-mv-3.14.ebuild
@@ -1,18 +1,20 @@
-# Copyright 2012-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
+inherit eutils
mPN="${PN%-*}"
DESCRIPTION="Organize your world file and find installed packages or differences to @world"
HOMEPAGE="https://github.com/vaeth/world/"
-SRC_URI="https://github.com/vaeth/${mPN}/archive/v${PV}.tar.gz -> ${mPN}-${PV}.tar.gz"
+SRC_URI="https://github.com/vaeth/${mPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${mPN}-${PV}"
-LICENSE="BSD"
+LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE=""
S="${WORKDIR}/${mPN}-${PV}"
@@ -20,16 +22,16 @@ src_prepare() {
if use prefix
then sed -i \
-e "s'\${EPREFIX}'\\'${EPREFIX}\\''" \
- -- bin/* || die
+ -- "${mPN}" || die
else sed -i \
-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
- -- bin/* || die
+ -- "${mPN}" || die
fi
- default
+ epatch_user
}
src_install() {
- dobin bin/*
+ dobin "${mPN}"
insinto /usr/share/zsh/site-functions
- doins zsh/*
+ doins _"${mPN}"
}
diff --git a/app-shells/auto-fu-zsh/ChangeLog b/app-shells/auto-fu-zsh/ChangeLog
new file mode 100644
index 00000000..9486fa06
--- /dev/null
+++ b/app-shells/auto-fu-zsh/ChangeLog
@@ -0,0 +1,50 @@
+# ChangeLog for app-shells/auto-fu-zsh
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*auto-fu-zsh-99999999 (14 Sep 2013)
+
+ 20 Sep 2014; Martin Väth <martin@mvath.de>:
+ Fix compilation in some corner cases
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Rename live-version back. Bump to git-r3
+
+*auto-fu-zsh-0.0.1.12-r4, auto-fu-zsh-99999999-r2 (26 Jan 2012)
+
+ 26 Jan 2013; Martin Väth <martin@mvath.de>:
+ Remove kill-line patch. Instead describe it in zshrc-example.
+
+*auto-fu-zsh-0.0.1.12-r3, auto-fu-zsh-99999999-r1 (10 Jan 2012)
+
+ 10 Jan 2013; Martin Väth <martin@mvath.de>:
+ Change install location, remove old ebuilds
+
+*auto-fu-zsh-99999999 (04 Nov 2012)
+
+ 17 Nov 2012; Martin Väth <martin@mvath.de>:
+ Remove _oldlist completer from defaults
+
+ 04 Nov 2012; Martin Väth <martin@mvath.de>:
+ Provide git version which works nicely with zsh-syntax-highlighting
+
+*auto-fu-zsh-0.0.1.12-r1 (16 Aug 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 16 Aug 2012; Martin Väth <martin@mvath.de>:
+ Make Ctrl-D return correctly (and optionally act as kill{-whole,}-line)
+ Restore default color after accept-line; fix compatibility with earlier
+ zsh versions
+
+*auto-fu-zsh-0.0.1.12 (12 Aug 2012)
+
+ 14 Aug 2012; Martin Väth <martin@mvath.de>:
+ Improve comments.
+
+ 12 Aug 2012; Martin Väth <martin@mvath.de>:
+ Write ebuild from scratch.
diff --git a/app-shells/auto-fu-zsh/Manifest b/app-shells/auto-fu-zsh/Manifest
index e620444f..e0c1e71b 100644
--- a/app-shells/auto-fu-zsh/Manifest
+++ b/app-shells/auto-fu-zsh/Manifest
@@ -1,2 +1 @@
-DIST auto-fu-zsh-0.0.1.12.tar.gz 9409 SHA256 cf692f8a81588289e44396f06e30e36fc6fa6bdcb2c87e4d462a15bad61db1c1 SHA512 7e5dbbb7329bfb220fe467de0eebc7d2aa2469ddea84d516deaa00d193729362f02355325765b29f16df66fbf458df69f984b70fad801b97af65a498080272ba
-DIST auto-fu-zsh-0.0.1.12_p0.tar.gz 17131 SHA512 0776897fa8f587bc69d48ffe2a8f3e4a5f1c14f7f3707c0cc9557f1722d97ec6c2ee24cd1cdce68c79146487d2784c3c3c4c9bcb80be6f17b295b6829fe19415
+DIST auto-fu-zsh-0.0.1.12.tar.gz 9409 SHA256 cf692f8a81588289e44396f06e30e36fc6fa6bdcb2c87e4d462a15bad61db1c1 SHA512 7e5dbbb7329bfb220fe467de0eebc7d2aa2469ddea84d516deaa00d193729362f02355325765b29f16df66fbf458df69f984b70fad801b97af65a498080272ba WHIRLPOOL 10960ac344555312310170e6384e539767ce2c86a2948bf165b23b00bc282cea0f84d7a876e774df73e54a78bdc0606d4c9fc5b0cb9b41df99e2dc55f1a59bdd
diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild
index aad9a8a6..feb8d9bb 100644
--- a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild
+++ b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r4.ebuild
@@ -1,31 +1,27 @@
-# Copyright 2012-2018 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
+inherit eutils
pPN=${PN%-zsh}
mPN="${pPN}.zsh"
-NEED_PATCHES=false
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
case ${PV} in
99999999*)
- EGIT_REPO_URI="https://github.com/hchbaw/${mPN}.git"
+ LIVE=:
+ EGIT_REPO_URI="git://github.com/hchbaw/${mPN}.git"
EGIT_BRANCH="pu"
inherit git-r3
PROPERTIES="live"
SRC_URI=""
KEYWORDS="";;
-0.0.1.12_p0)
- RESTRICT="mirror"
- EGIT_COMMIT="42dbef5da89360f132cce010004d4c674a13c951"
- SRC_URI="https://github.com/hchbaw/${mPN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${mPN}-${EGIT_COMMIT}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris";;
*)
+ LIVE=false
RESTRICT="mirror"
SRC_URI="https://github.com/hchbaw/${mPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${mPN}-${PV}"
- NEED_PATCHES=:;;
+ KEYWORDS="~amd64 ~x86";;
esac
DESCRIPTION="zsh automatic complete-word and list-choices: incremental completion"
@@ -106,16 +102,16 @@ src_prepare() {
umask 022
generate_example >"${S}"/zshrc-example
)
- if ${NEED_PATCHES}
+ if ! ${LIVE}
then
# Make Ctrl-D return correctly.
- eapply "${FILESDIR}"/exit.patch
+ epatch "${FILESDIR}"/exit.patch
# Reset color with "return":
- eapply "${FILESDIR}"/reset-color.patch
+ epatch "${FILESDIR}"/reset-color.patch
# Make it work with older zsh versions:
- eapply "${FILESDIR}"/zsh-compatibility.patch
+ epatch "${FILESDIR}"/zsh-compatibility.patch
fi
- default
+ epatch_user
}
src_compile() {
diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12_p0.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12_p0.ebuild
deleted file mode 100644
index aad9a8a6..00000000
--- a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12_p0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 2012-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-pPN=${PN%-zsh}
-mPN="${pPN}.zsh"
-NEED_PATCHES=false
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-case ${PV} in
-99999999*)
- EGIT_REPO_URI="https://github.com/hchbaw/${mPN}.git"
- EGIT_BRANCH="pu"
- inherit git-r3
- PROPERTIES="live"
- SRC_URI=""
- KEYWORDS="";;
-0.0.1.12_p0)
- RESTRICT="mirror"
- EGIT_COMMIT="42dbef5da89360f132cce010004d4c674a13c951"
- SRC_URI="https://github.com/hchbaw/${mPN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${mPN}-${EGIT_COMMIT}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris";;
-*)
- RESTRICT="mirror"
- SRC_URI="https://github.com/hchbaw/${mPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${mPN}-${PV}"
- NEED_PATCHES=:;;
-esac
-
-DESCRIPTION="zsh automatic complete-word and list-choices: incremental completion"
-HOMEPAGE="https://github.com/hchbaw/auto-fu.zsh/"
-
-LICENSE="HPND"
-SLOT="0"
-IUSE="+compile"
-
-DEPEND="compile? ( app-shells/zsh )"
-
-DESTPATH="/usr/share/zsh/site-contrib/${mPN}"
-
-generate_example() {
- echo "# Put something like the following into your ~/.zshrc
-
-# First, we set sane options for the standard completion system:
-
-autoload -Uz compinit is-at-least
-compinit -D -u
-zstyle ':completion:*' completer _complete
-zstyle ':completion:*' list-colors \${(s.:.)LS_COLORS}
-zstyle ':completion:*' menu select=1 # interactive
-zstyle ':completion:*' accept-exact-dirs true
-zstyle ':completion:*' path-completion false
-if is-at-least 4.3.10
-then zstyle ':completion:*' format \"%B%F{yellow}%K{blue}%d%k%f%b\"
-else zstyle ':completion:*' format \"%B%d%b\"
-fi
-
-# Now we source ${PN}"
- if use compile
- then echo ". ${DESTPATH}/${pPN}
-auto-fu-install"
- else echo ". ${DESTPATH}/${pPN}.zsh"
- fi
- echo "
-# Finally, we configure ${PN}
-
-zstyle ':auto-fu:highlight' input
-zstyle ':auto-fu:highlight' completion bold,fg=blue
-zstyle ':auto-fu:highlight' completion/one fg=blue
-zstyle ':auto-fu:var' postdisplay # \$'\\n-azfu-'
-#zstyle ':auto-fu:var' enable all
-#zstyle ':auto-fu:var' track-keymap-skip opp
-#zstyle ':auto-fu:var' disable magic-space
-zle-line-init() auto-fu-init
-zle -N zle-line-init
-zle -N zle-keymap-select auto-fu-zle-keymap-select
-
-# Starting a line with a space or tab or quoting the first word
-# or escaping a word should deactivate auto-fu for that line/word.
-# This is useful e.g. if auto-fu is too slow for you in some cases.
-zstyle ':auto-fu:var' autoable-function/skiplines '[[:blank:]\\\\\"'\'']*'
-zstyle ':auto-fu:var' autoable-function/skipwords '[\\\\]*'
-
-# Let Ctrl-d successively remove tail of line, whole line, and exit
-kill-line-maybe() {
- if ((\$#BUFFER > CURSOR))
- then zle kill-line
- else zle kill-whole-line
- fi
-}
-zle -N kill-line-maybe
-bindkey '\C-d' kill-line-maybe
-
-# Keep Ctrl-d behavior also when auto-fu is active
-afu+orf-ignoreeof-deletechar-list() {
- afu-eof-maybe afu-ignore-eof zle kill-line-maybe
-}
-afu+orf-exit-deletechar-list() {
- afu-eof-maybe exit zle kill-line-maybe
-}"
-}
-
-src_prepare() {
- (
- umask 022
- generate_example >"${S}"/zshrc-example
- )
- if ${NEED_PATCHES}
- then
- # Make Ctrl-D return correctly.
- eapply "${FILESDIR}"/exit.patch
- # Reset color with "return":
- eapply "${FILESDIR}"/reset-color.patch
- # Make it work with older zsh versions:
- eapply "${FILESDIR}"/zsh-compatibility.patch
- fi
- default
-}
-
-src_compile() {
- ! use compile || mPN="${mPN}" \
- zsh -c 'setopt extendedglob no_shwordsplit
-source ${mPN}
-auto-fu-zcompile ${PWD}/${mPN} ${PWD}' || die
-}
-
-src_install() {
- insinto "${DESTPATH}"
- doins "${mPN}"
- ! use compile || doins "${pPN}" "${pPN}.zwc"
- dodoc zshrc-example README*
-}
diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild
index aad9a8a6..feb8d9bb 100644
--- a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild
+++ b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild
@@ -1,31 +1,27 @@
-# Copyright 2012-2018 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
+inherit eutils
pPN=${PN%-zsh}
mPN="${pPN}.zsh"
-NEED_PATCHES=false
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
case ${PV} in
99999999*)
- EGIT_REPO_URI="https://github.com/hchbaw/${mPN}.git"
+ LIVE=:
+ EGIT_REPO_URI="git://github.com/hchbaw/${mPN}.git"
EGIT_BRANCH="pu"
inherit git-r3
PROPERTIES="live"
SRC_URI=""
KEYWORDS="";;
-0.0.1.12_p0)
- RESTRICT="mirror"
- EGIT_COMMIT="42dbef5da89360f132cce010004d4c674a13c951"
- SRC_URI="https://github.com/hchbaw/${mPN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${mPN}-${EGIT_COMMIT}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris";;
*)
+ LIVE=false
RESTRICT="mirror"
SRC_URI="https://github.com/hchbaw/${mPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${mPN}-${PV}"
- NEED_PATCHES=:;;
+ KEYWORDS="~amd64 ~x86";;
esac
DESCRIPTION="zsh automatic complete-word and list-choices: incremental completion"
@@ -106,16 +102,16 @@ src_prepare() {
umask 022
generate_example >"${S}"/zshrc-example
)
- if ${NEED_PATCHES}
+ if ! ${LIVE}
then
# Make Ctrl-D return correctly.
- eapply "${FILESDIR}"/exit.patch
+ epatch "${FILESDIR}"/exit.patch
# Reset color with "return":
- eapply "${FILESDIR}"/reset-color.patch
+ epatch "${FILESDIR}"/reset-color.patch
# Make it work with older zsh versions:
- eapply "${FILESDIR}"/zsh-compatibility.patch
+ epatch "${FILESDIR}"/zsh-compatibility.patch
fi
- default
+ epatch_user
}
src_compile() {
diff --git a/app-shells/auto-fu-zsh/metadata.xml b/app-shells/auto-fu-zsh/metadata.xml
index 126fbf6c..1576938b 100644
--- a/app-shells/auto-fu-zsh/metadata.xml
+++ b/app-shells/auto-fu-zsh/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-shells/command-not-found/ChangeLog b/app-shells/command-not-found/ChangeLog
new file mode 100644
index 00000000..b4dcb6cf
--- /dev/null
+++ b/app-shells/command-not-found/ChangeLog
@@ -0,0 +1,26 @@
+# ChangeLog for app-shells/command-not-found
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*command-not-found-0.4.5 (07 Jun 2013)
+
+ 07 Jun 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Remove data directory on removal.
+
+*command-not-found-0.4.4 (30 Sep 2012)
+
+ 30 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*command-not-found-0.4.3-r1 (13 Aug 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 13 Aug 2012; Martin Väth <martin@mvath.de>:
+ Make /etc/profile.d/cnf.sh readable by dash and do not make it executable.
+
+*command-not-found-0.4.3 (12 Aug 2012)
+
+ 12 Aug 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch.
diff --git a/app-shells/command-not-found/Manifest b/app-shells/command-not-found/Manifest
new file mode 100644
index 00000000..73ec8857
--- /dev/null
+++ b/app-shells/command-not-found/Manifest
@@ -0,0 +1 @@
+DIST command-not-found-0.4.5.tar.gz 28761 SHA256 891c5a7f2e55e420dd92ce4358d7c2f6028144c92bd522163848345c4c32b914 SHA512 3512ef8618a23416dd0da37ea2ccd40b78e44751b16703b745360345430ce697713a7b781c065536d7fd8b54ca0f4713ce153b2f32f5266b6db222ac2aa23c0b WHIRLPOOL 95e730db83571e6cab799a8c8865117cae74573cb1f2b769fb72e329793643058f6e49c406dd26adc18f63d38b66151a48c06e565382d2c78f864bdb22268fbc
diff --git a/app-shells/command-not-found/command-not-found-0.4.5.ebuild b/app-shells/command-not-found/command-not-found-0.4.5.ebuild
new file mode 100644
index 00000000..77f3273f
--- /dev/null
+++ b/app-shells/command-not-found/command-not-found-0.4.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit cmake-utils eutils flag-o-matic multilib
+
+DESCRIPTION="If a command is not found (bash/zsh), search ARCH database for packages with similar commands"
+HOMEPAGE="https://github.com/metti/command-not-found/"
+SRC_URI="https://github.com/metti/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON="sys-libs/tdb"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+ PREFIX=${EPREFIX}
+ filter-flags -fwhole-program
+ sed -i -e 1d -e '2i#! /bin/sh' cnf-cron.in || die
+ sed -i \
+ -e "s!usr/lib!usr/$(get_libdir)!g" \
+ -e "/^INSTALL.*cnf\.sh/,/^INSTALL/{/EXECUTE/d}" \
+ CMakeLists.txt || die
+ sed -i -e "s/function[[:space:]]*\([^[:space:](]*\)[[:space:]]*(/\1(/" \
+ cnf.sh || die
+ epatch_user
+}
+
+src_install() {
+ dodir /var/lib/cnf
+ cmake-utils_src_install
+}
+
+pkg_postrm() {
+ local a
+ if [ -z "${REPLACED_BY_VERSION}" ] && a="${EPREFIX}/var/lib/cnf" && \
+ test -d "${a}"
+ then ewarn "removing now unneeded ${a}"
+ rm -rf -- "${a}"
+ fi
+}
diff --git a/app-eselect/eselect-net/metadata.xml b/app-shells/command-not-found/metadata.xml
index 68021054..cc0f89f0 100644
--- a/app-eselect/eselect-net/metadata.xml
+++ b/app-shells/command-not-found/metadata.xml
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
<upstream>
<maintainer>
- <name>reith</name>
+ <email>matthias@maennich.net</email>
+ <name>Matthias Maennich</name>
</maintainer>
- <bugs-to>https://github.com/reith/eselect-net/issues</bugs-to>
- <remote-id type="github">reith/eselect-net</remote-id>
+ <bugs-to>mailto:matthias@maennich.net</bugs-to>
+ <remote-id type="github">metti/command-not-found</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-shells/dash/dash-99999999.ebuild b/app-shells/dash/dash-99999999.ebuild
deleted file mode 100644
index af44d28f..00000000
--- a/app-shells/dash/dash-99999999.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Martin V\"ath and others
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LIVE=false
-case ${PV} in
-99999999*)
- LIVE=:;;
-esac
-if ${LIVE}
-then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/dash/dash.git"
- WANT_LIBTOOL=none
- AT_NOELIBTOOLIZE=true
- inherit autotools git-r3
- PROPERTIES="live"
- KEYWORDS=""
- SRC_URI=""
-else # inherit versionator
- #MY_PV="$(get_version_component_range 1-3)"
- DEB_PATCH="" #"$(get_version_component_range 4)"
- #MY_P="${PN}-${MY_PV}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
- SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
- if [ -n "${DEB_PATCH}" ]
- then DEB_PF="${PN}_${MY_PV}-${DEB_PATCH}"
- SRC_URI=${SRC_URI}" mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz"
- fi
- #S=${WORKDIR}/${MY_P}
-fi
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Descendant of the NetBSD ash. POSIX compliant except for multibyte characters"
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="libedit static vanilla"
-
-RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
-
-src_prepare() {
- local c
- use vanilla || eapply "${FILESDIR}"/dumb-echo.patch
- if [ -n "${DEB_PATCH}" ]
- then eapply "${WORKDIR}"/${DEB_PF}.diff
- eapply */debian/diff/*
- fi
- c='configure.ac configure'
- if ${LIVE}
- then test -r configure || c=configure.ac
- else c=configure
- fi
- # Use pkg-config for libedit linkage
- sed -i \
- -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \
- ${c} || die
-
- default
- ! ${LIVE} || eautoreconf
-}
-
-src_configure() {
- append-cppflags -DJOBS=$(usex libedit 1 0)
- use static && append-ldflags -static
- # Do not pass --enable-glob due to #443552.
- # Autotools use $LINENO as a proxy for extended debug support
- # (i.e. they're running bash), so disable that. #527644
- econf \
- --bindir="${EPREFIX}"/bin \
- --enable-fnmatch \
- --disable-lineno \
- $(use_with libedit)
-}
-
-src_install() {
- default
- [ -z "${DEB_PATCH}" ] || dodoc */debian/changelog
-}
diff --git a/app-shells/dash/files/dumb-echo.patch b/app-shells/dash/files/dumb-echo.patch
deleted file mode 100644
index cbf5feba..00000000
--- a/app-shells/dash/files/dumb-echo.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-http://bugs.gentoo.org/337329
-http://bugs.gentoo.org/527848
-
-there's no requirement for `echo` to support escape sequences. bash, by default,
-does not, while dash always does. POSIX permits either behavior:
-http://pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html
-
-however, since the behavior is not portable, no one should be relying on echo
-having any specific behavior. they should use `printf` when they want an escape
-sequence. it also makes dash smaller & faster to disable this logic entirely.
-
---- dash-0.5.9.1/src/bltin/printf.c
-+++ dash-0.5.9.1/src/bltin/printf.c
-@@ -449,21 +449,12 @@
- int
- echocmd(int argc, char **argv)
- {
-- int nonl;
--
-- nonl = *++argv ? equal(*argv, "-n") : 0;
-- argv += nonl;
--
-- do {
-- int c;
--
-- if (likely(*argv))
-- nonl += print_escape_str("%s", NULL, NULL, *argv++);
-- if (likely((nonl + !*argv) > 1))
-- break;
--
-- c = *argv ? ' ' : '\n';
-- out1c(c);
-- } while (*argv);
-+ int i;
-+ for (i = 1; i < argc; ++i) {
-+ outstr(argv[i], out1);
-+ if (i < argc - 1)
-+ outc(' ', out1);
-+ }
-+ outc('\n', out1);
- return 0;
- }
---- dash-0.5.9.1/src/dash.1
-+++ dash-0.5.9.1/src/dash.1
-@@ -1182,43 +1182,15 @@
- option turns off the effect of any preceding
- .Fl P
- options.
--.It Xo echo Op Fl n
-+.It Xo echo
- .Ar args...
- .Xc
- Print the arguments on the standard output, separated by spaces.
--Unless the
--.Fl n
--option is present, a newline is output following the arguments.
- .Pp
--If any of the following sequences of characters is encountered during
--output, the sequence is not output. Instead, the specified action is
--performed:
--.Bl -tag -width indent
--.It Li \eb
--A backspace character is output.
--.It Li \ec
--Subsequent output is suppressed. This is normally used at the end of the
--last argument to suppress the trailing newline that
--.Ic echo
--would otherwise output.
--.It Li \ef
--Output a form feed.
--.It Li \en
--Output a newline character.
--.It Li \er
--Output a carriage return.
--.It Li \et
--Output a (horizontal) tab character.
--.It Li \ev
--Output a vertical tab.
--.It Li \e0 Ns Ar digits
--Output the character whose value is given by zero to three octal digits.
--If there are zero digits, a nul character is output.
--.It Li \e\e
--Output a backslash.
--.El
-+No arguments or backslash sequences are supported as they are not portable.
-+They will be printed out exactly as passed in.
- .Pp
--All other backslash sequences elicit undefined behaviour.
-+You can replace `echo -n ...` with the portable `printf %s ...` construct.
- .It eval Ar string ...
- Concatenate all the arguments with spaces.
- Then re-parse and execute the command.
diff --git a/app-shells/dash/metadata.xml b/app-shells/dash/metadata.xml
deleted file mode 100644
index 2af3d735..00000000
--- a/app-shells/dash/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- <description>maintainer of the live version in the mv overlay</description>
- </maintainer>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
- </maintainer>
- <upstream>
- <remote-id type="cpe">cpe:/a:dash:dash</remote-id>
- </upstream>
- <use>
- <flag name="vanilla">Let echo escapes and -n work as decided by upstream</flag>
- </use>
- <longdescription lang="en">
- DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell)
- and is almost POSIX compliant.
- </longdescription>
-</pkgmetadata>
diff --git a/app-shells/fast-syntax-highlighting/Manifest b/app-shells/fast-syntax-highlighting/Manifest
deleted file mode 100644
index 28ec2451..00000000
--- a/app-shells/fast-syntax-highlighting/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fast-syntax-highlighting-1.5.5.tar.gz 615290 SHA512 0b4faf842c2e853bb9f8e3ecb7a12136efaf359a46d35904fdf33e8792af06e8f15a6e1ac59cf096708ef3fb71376c2b5ec5769eeb27e864bbca2ed97fb9ac0c
diff --git a/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-1.5.5.ebuild b/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-1.5.5.ebuild
deleted file mode 100644
index f3f2c1fd..00000000
--- a/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-1.5.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2011-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-RESTRICT="mirror"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-case ${PV} in
-99999999*)
- EGIT_REPO_URI="https://github.com/zdharma/${PN}.git"
- inherit git-r3
- PROPERTIES="live"
- SRC_URI=""
- KEYWORDS="";;
-*alpha*)
- EGIT_COMMIT="3361bb62d66540eda6dfa23f3df34125c27d420f"
- SRC_URI="https://github.com/zdharma/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
-*)
- myPN=$(ver_rs 2 '')
- SRC_URI="https://github.com/zdharma/${PN}/archive/v${myPN}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${myPN}";;
-esac
-
-DESCRIPTION="Optimized and extended zsh-syntax-highlighting"
-HOMEPAGE="https://github.com/zdharma/fast-syntax-highlighting/"
-
-LICENSE="HPND"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-shells/zsh"
-DEPEND=""
-
-src_install() {
- local DISABLE_AUTOFORMATTING DOC_CONTENTS dir
- dir="/usr/share/zsh/site-contrib/${PN}"
- DISABLE_AUTOFORMATTING="true"
- DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
-. ${EPREFIX}${dir}/fast-syntax-highlighting.plugin.zsh"'
-at the end of your ~/.zshrc
-For testing, you can also execute the above command in your zsh.'
- readme.gentoo_create_doc
- insinto "${dir}"
- doins -r *
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-99999999.ebuild b/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-99999999.ebuild
deleted file mode 100644
index f3f2c1fd..00000000
--- a/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-99999999.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2011-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-RESTRICT="mirror"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-case ${PV} in
-99999999*)
- EGIT_REPO_URI="https://github.com/zdharma/${PN}.git"
- inherit git-r3
- PROPERTIES="live"
- SRC_URI=""
- KEYWORDS="";;
-*alpha*)
- EGIT_COMMIT="3361bb62d66540eda6dfa23f3df34125c27d420f"
- SRC_URI="https://github.com/zdharma/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
-*)
- myPN=$(ver_rs 2 '')
- SRC_URI="https://github.com/zdharma/${PN}/archive/v${myPN}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${myPN}";;
-esac
-
-DESCRIPTION="Optimized and extended zsh-syntax-highlighting"
-HOMEPAGE="https://github.com/zdharma/fast-syntax-highlighting/"
-
-LICENSE="HPND"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-shells/zsh"
-DEPEND=""
-
-src_install() {
- local DISABLE_AUTOFORMATTING DOC_CONTENTS dir
- dir="/usr/share/zsh/site-contrib/${PN}"
- DISABLE_AUTOFORMATTING="true"
- DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
-. ${EPREFIX}${dir}/fast-syntax-highlighting.plugin.zsh"'
-at the end of your ~/.zshrc
-For testing, you can also execute the above command in your zsh.'
- readme.gentoo_create_doc
- insinto "${dir}"
- doins -r *
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-shells/fast-syntax-highlighting/metadata.xml b/app-shells/fast-syntax-highlighting/metadata.xml
deleted file mode 100644
index abaca81a..00000000
--- a/app-shells/fast-syntax-highlighting/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <bugs-to>https://github.com/zdharma/fast-syntax-highlighting/issues</bugs-to>
- <remote-id type="github">zdharma/fasth-syntax-highlighting</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-shells/oh-my-zsh/ChangeLog b/app-shells/oh-my-zsh/ChangeLog
new file mode 100644
index 00000000..5af7f352
--- /dev/null
+++ b/app-shells/oh-my-zsh/ChangeLog
@@ -0,0 +1,30 @@
+# ChangeLog for app-shells/oh-my-zsh
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 24 Jan 2014; Martin Väth <martin@mvath.de>:
+ Avoid duplicate installation
+
+ 12 Oct 2013; Martin Väth <martin@mvath.de>:
+ Use readme.gentoo.eclass
+
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Bump to git-r3.eclass
+
+ 14 Aug 2013; Martin Väth <martin@mvath.de>:
+ Simplify EPREFIX (without revision bump)
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 03 Feb 2012; Martin Väth <martin@mvath.de>:
+ Fix description
+
+ 06 Nov 2011; Martin Väth <martin@mvath.de>:
+ Write ebuild from scratch.
diff --git a/app-shells/oh-my-zsh/metadata.xml b/app-shells/oh-my-zsh/metadata.xml
index 216d1806..ef32a6e3 100644
--- a/app-shells/oh-my-zsh/metadata.xml
+++ b/app-shells/oh-my-zsh/metadata.xml
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
<upstream>
<maintainer>
+ <email></email>
<name>Robby Russell</name>
</maintainer>
<bugs-to>https://github.com/robbyrussell/oh-my-zsh/issues</bugs-to>
diff --git a/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild b/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
index d0dcf394..16b8d791 100644
--- a/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
+++ b/app-shells/oh-my-zsh/oh-my-zsh-99999999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2011-2018 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
-EGIT_REPO_URI="https://github.com/robbyrussell/${PN}.git"
-inherit git-r3 readme.gentoo-r1
+EGIT_REPO_URI="git://github.com/robbyrussell/${PN}.git"
+inherit eutils git-r3 readme.gentoo
DESCRIPTION="A ready-to-use zsh configuration with plugins"
HOMEPAGE="https://github.com/robbyrussell/oh-my-zsh"
@@ -12,7 +13,7 @@ SRC_URI=""
LICENSE="ZSH"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE=""
PROPERTIES="live"
@@ -22,6 +23,12 @@ ZSH_DEST="/usr/share/zsh/site-contrib/${PN}"
ZSH_EDEST="${EPREFIX}${ZSH_DEST}"
ZSH_TEMPLATE="templates/zshrc.zsh-template"
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add to your ~/.zshrc
+source '${ZSH_DEST}/${ZSH_TEMPLATE}'
+or copy a modification of that file to your ~/.zshrc
+If you just want to try, enter the above command in your zsh."
+
src_prepare() {
local i
for i in "${S}"/tools/*install* "${S}"/tools/*upgrade*
@@ -32,22 +39,11 @@ src_prepare() {
sed -i -e 's!~/.oh-my-zsh!'"${ZSH_EDEST}"'!' \
"${S}/plugins/dirpersist/dirpersist.plugin.zsh"
sed -i -e '/zstyle.*cache/d' "${S}/lib/completion.zsh"
- default
+ epatch_user
}
src_install() {
- local DISABLE_AUTOFORMATTING DOC_CONTENTS
insinto "${ZSH_DEST}"
doins -r *
- DISABLE_AUTOFORMATTING="true"
- DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add to your ~/.zshrc
-source '${ZSH_DEST}/${ZSH_TEMPLATE}'
-or copy a modification of that file to your ~/.zshrc
-If you just want to try, enter the above command in your zsh."
-
readme.gentoo_create_doc
}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-shells/push/Manifest b/app-shells/push/Manifest
deleted file mode 100644
index a3320649..00000000
--- a/app-shells/push/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST push-3.4.tar.gz 2839 SHA512 aa118f42210b40d790c0b274045ff45c2067cf894731228f5065eb44a723fd813549204797c365329f409e36f564ec22f6d956341b1f2b62964b918e76991344
diff --git a/app-shells/push/metadata.xml b/app-shells/push/metadata.xml
deleted file mode 100644
index 2c9ef922..00000000
--- a/app-shells/push/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <bugs-to>mailto:martin@mvath.de</bugs-to>
- <remote-id type="github">vaeth/push</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-shells/push/push-3.4.ebuild b/app-shells/push/push-3.4.ebuild
deleted file mode 100644
index a16370d1..00000000
--- a/app-shells/push/push-3.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2012-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A POSIX shell function to treat a variable like an array, quoting args"
-HOMEPAGE="https://github.com/vaeth/push/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="split-usr"
-
-# Install into / to let sys-block/zram-init work with split /usr
-
-src_compile() {
- emake PREFIX= EPREFIX="${EPREFIX}" BINDIR=$(get_usr)/bin DATADIR=$(get_usr)/lib/push
-}
-
-src_install() {
- dodoc README.md
- emake DESTDIR="${ED}" PREFIX= EPREFIX="${EPREFIX}" BINDIR=$(get_usr)/bin DATADIR=$(get_usr)/lib/push install
-}
-
-get_usr() {
- use split-usr || echo /usr
-}
diff --git a/app-shells/quoter/Manifest b/app-shells/quoter/Manifest
deleted file mode 100644
index 8346fe05..00000000
--- a/app-shells/quoter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST quoter-4.2.tar.gz 11128 SHA512 0080ae6d5f5308b9e2f9e414619049f10246c221a9524f9f0dc0d329af3592694ae9d6ef6a086615b895c5f6598fbed7ec7164b5a847d11108fbe3687316c02d
diff --git a/app-shells/quoter/metadata.xml b/app-shells/quoter/metadata.xml
deleted file mode 100644
index 97eb368d..00000000
--- a/app-shells/quoter/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <bugs-to>mailto:martin@mvath.de</bugs-to>
- <remote-id type="github">vaeth/quoter</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-shells/quoter/quoter-4.2.ebuild b/app-shells/quoter/quoter-4.2.ebuild
deleted file mode 100644
index 63c07f73..00000000
--- a/app-shells/quoter/quoter-4.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2016-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Quote arguments or standard input for usage in POSIX shell by eval"
-HOMEPAGE="https://github.com/vaeth/quoter/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_compile() {
- emake CC="$(tc-getCC)" EPREFIX="${EPREFIX}"
-}
-
-src_install() {
- emake DESTDIR="${ED}" EPREFIX="${EPREFIX}" install
- dodoc README.md
-}
diff --git a/app-shells/runtitle/ChangeLog b/app-shells/runtitle/ChangeLog
new file mode 100644
index 00000000..2fb2856c
--- /dev/null
+++ b/app-shells/runtitle/ChangeLog
@@ -0,0 +1,71 @@
+# ChangeLog for app-shells/runtitle
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*runtitle-2.7 (05 Sep 2015)
+
+ 05 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*runtitle-2.6 (16 Jun 2015)
+
+ 16 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*runtitle-2.5-r1 (17 Dec 2013)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix sh path
+
+*runtitle-2.5 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*runtitle-2.4 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Shebang care
+
+*runtitle-2.3 (17 Nov 2012)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 17 Nov 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*runtitle-2.2 (11 Sep 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 11 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Rename run->runner to avoid collision
+ with gdb. Thanks to Massimo B. for pointing out this problem
+
+*runtitle-2.0 (06 Sep 2012)
+
+ 06 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*runtitle-1.2 (04 Sep 2012)
+
+ 04 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*runtitle-1.1 (07 May 2012)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*runtitle-1.0 (04 May 2012)
+
+ 04 May 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/app-shells/runtitle/Manifest b/app-shells/runtitle/Manifest
index 9ddfb2f1..67133def 100644
--- a/app-shells/runtitle/Manifest
+++ b/app-shells/runtitle/Manifest
@@ -1 +1 @@
-DIST runtitle-2.11.tar.gz 3630 SHA512 5587e8217dc770317729c356206d8ffb4c9e5566ae1cf60f9282183afc763af33a60401d5a8cac919d62e5167073385e26c0b89811a680c9cae512c4aac0da12
+DIST runtitle-2.7.tar.gz 3372 SHA256 6ea63935ad18ad3544e42db4ca93a218e1c9b7e3b70033af07cdc3c74e278022 SHA512 c31910a1af307fd0dcb12a4faf19de6613b70b13ed118e0e97f947540ee6128955de9c245de29b87ce75b611f08800df9bfafd70f53ae4b54772485607b87e46 WHIRLPOOL 75859849587241b34b4a8e1dc3cbbf8ce2fe54a37cb2473299d4b24a8e616ea8ccc71c1656e1b37a171582bdb4a76d8d53d858d950cfe24170d2af2c9d7a1b4a
diff --git a/app-shells/runtitle/metadata.xml b/app-shells/runtitle/metadata.xml
index 526cd7d9..3b185b53 100644
--- a/app-shells/runtitle/metadata.xml
+++ b/app-shells/runtitle/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-shells/runtitle/runtitle-2.11.ebuild b/app-shells/runtitle/runtitle-2.7.ebuild
index 27211b03..71ebe8a4 100644
--- a/app-shells/runtitle/runtitle-2.11.ebuild
+++ b/app-shells/runtitle/runtitle-2.7.ebuild
@@ -1,8 +1,10 @@
-# Copyright 2012-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
+inherit eutils
DESCRIPTION="Scripts to run commands and set the hard status line (windows title)"
HOMEPAGE="https://github.com/vaeth/runtitle/"
@@ -10,19 +12,19 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
src_prepare() {
use prefix || sed -i \
-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-- bin/* || die
- default
+ epatch_user
}
src_install() {
dobin bin/*
insinto /usr/share/zsh/site-functions
doins zsh/*
- dodoc README.md
+ dodoc README
}
diff --git a/app-shells/schily-tools/Manifest b/app-shells/schily-tools/Manifest
deleted file mode 100644
index d5e5749d..00000000
--- a/app-shells/schily-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST schily-2021-04-21.tar.bz2 4919718 SHA512 feb6150fbf79b9a12be58325eac328393c504635f461993b24edcfc18df53953b4c28390187c38c8eccc8cc905354b8fb2f50f5f60beb04363bb9ce32d8203e6
diff --git a/app-shells/schily-tools/files/cdrtools-fix-clone-uclibc.patch b/app-shells/schily-tools/files/cdrtools-fix-clone-uclibc.patch
deleted file mode 100644
index 9ffd28a5..00000000
--- a/app-shells/schily-tools/files/cdrtools-fix-clone-uclibc.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naur cdrtools-3.02.orig/readcd/readcd.c cdrtools-3.02/readcd/readcd.c
---- cdrtools-3.02.orig/readcd/readcd.c 2016-01-24 11:15:19.000000000 -0500
-+++ cdrtools-3.02/readcd/readcd.c 2016-04-09 12:29:54.727635502 -0400
-@@ -257,7 +257,7 @@
- BOOL pifscan;
- BOOL plot;
- BOOL fulltoc;
--BOOL clone;
-+BOOL clonetoc;
- BOOL edc_corr;
- BOOL noerror;
- BOOL nocorr;
-@@ -294,7 +294,7 @@
- error(_("\t-plot Print data suitable for gnuplot\n"));
- #ifdef CLONE_WRITE
- error(_("\t-fulltoc Retrieve the full TOC\n"));
-- error(_("\t-clone Retrieve the full TOC and all data\n"));
-+ error(_("\t-clonetoc Retrieve the full TOC and all data\n"));
- error(_("\t-edc-corr Try to do user level Reed Solomon repair (experimental)\n"));
- #endif
- error(_("\ttimeout=# set the default SCSI command timeout to #.\n"));
-@@ -320,7 +320,7 @@
- }
-
- /* CSTYLED */
--char opts[] = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,scgopts*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clone,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#";
-+char opts[] = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,scgopts*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clonetoc,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#";
-
- EXPORT int
- main(ac, av)
-@@ -397,7 +397,7 @@
- &scanbus, &dev, &scgopts, &sectors, &do_write,
- &c2scan, &cxscan, &pi8scan, &pifscan,
- &plot,
-- &fulltoc, &clone,
-+ &fulltoc, &clonetoc,
- &edc_corr,
- &noerror, &nocorr,
- &notrunc, &retries, &do_factor, &filename,
-@@ -679,7 +679,7 @@
-
- if (filename || sectors || c2scan || cxscan || pi8scan || pifscan ||
- meshpoints || fulltoc ||
-- clone || edc_corr) {
-+ clonetoc || edc_corr) {
- dorw(scgp, filename, sectors);
- } else {
- doit(scgp);
-@@ -894,9 +894,9 @@
- if (params.name == NULL)
- params.name = "/dev/null";
- read_ftoc(scgp, &params, FALSE);
-- } else if (clone || edc_corr) {
-+ } else if (clonetoc || edc_corr) {
- if (!is_mmc(scgp, NULL, NULL))
-- comerrno(EX_BAD, _("Unsupported device for clone mode.\n"));
-+ comerrno(EX_BAD, _("Unsupported device for clonetoc mode.\n"));
- if (!edc_corr)
- noerror = TRUE;
- if (retries == MAX_RETRY)
-@@ -904,7 +904,7 @@
- if (params.name == NULL)
- params.name = "/dev/null";
-
-- if (clone)
-+ if (clonetoc)
- if (read_ftoc(scgp, &params, TRUE) < 0)
- comerrno(EX_BAD, _("Read fulltoc problems.\n"));
- readcd_disk(scgp, &params);
diff --git a/app-shells/schily-tools/files/strlcat-mapvers.patch b/app-shells/schily-tools/files/strlcat-mapvers.patch
deleted file mode 100644
index 2449910c..00000000
--- a/app-shells/schily-tools/files/strlcat-mapvers.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Martin V\"ath <martin at mvaeth.de> 2018/08/09
-# Temporary fix of missing strlcat for schily-tools-2018.08.07, see
-# https://sourceforge.net/p/schilytools/tickets/5/
-# Should be unnecessary in later schily-tools releases
---- 1/libschily/libschily-mapvers
-+++ 2/libschily/libschily-mapvers
-@@ -61,6 +61,9 @@
- js_mexval;
- strlcatl;
- wcslcatl;
-+#ifndef HAVE_STRLCAT
-+ strlcat;
-+#endif
- } SCHILY_1.6;
-
- SCHILY_1.6 {
diff --git a/app-shells/schily-tools/metadata.xml b/app-shells/schily-tools/metadata.xml
deleted file mode 100644
index 30c2edc7..00000000
--- a/app-shells/schily-tools/metadata.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>joerg.schilling@fokus.fraunhofer.de</email>
- <name>Jörg Schilling</name>
- </maintainer>
- <remote-id type="sourceforge">schilytools</remote-id>
- </upstream>
- <use>
- <flag name="renameschily_calc">Rename calc to scalc for compatibility with sci-mathematics/calc</flag>
- <flag name="renameschily_compare">Rename compare to scompare for compatibility with imagemagick</flag>
- <flag name="renameschily_count">Rename count to scount for compatibility with sys-devel/llvm</flag>
- <flag name="renameschily_getopt">Rename count to scount for compatibility with sys-devel/llvm</flag>
- <flag name="renameschily_jsh">Rename jsh to sjsh for compatibility with app-shells/heirloom-sh</flag>
- <flag name="renameschily_man2html">Rename man2html to sman2html for compatibility with sys-apps/man</flag>
- <flag name="renameschily_libschily">Rename some manpages from libschily for compatibility with sys-apps/man</flag>
- <flag name="renameschily_p">Rename p to sp for compatibility with dev-util/wiggle</flag>
- <flag name="schilytools_bosh">Install bosh, a shell which aims to be fully POSIX compatible</flag>
- <flag name="schilytools_calc">Install calc, a bc clone</flag>
- <flag name="schilytools_calltree">Install calltree, a cflow clone</flag>
- <flag name="schilytools_cdrtools">Install programs provided by app-cdr/cdrtools</flag>
- <flag name="schilytools_change">Install change, a program to change patterns in files</flag>
- <flag name="schilytools_compare">Install compare, a cmp clone</flag>
- <flag name="schilytools_copy">Install copy, a cp clone</flag>
- <flag name="schilytools_count">Install count, a wc clone</flag>
- <flag name="schilytools_cpp">Install cpp, a C preprocessor</flag>
- <flag name="schilytools_cstyle">Install Cstyle, a C-codingstyle lint</flag>
- <flag name="schilytools_cut">Install scut, a cut clone</flag>
- <flag name="schilytools_hdump">Install hdump, a hexdump clone</flag>
- <flag name="schilytools_label">Install label, a sun disk label manipulator</flag>
- <flag name="schilytools_lndir">Install lndir, a program for creating symlinked directory trees</flag>
- <flag name="schilytools_man2html">Install a man2html clone</flag>
- <flag name="schilytools_manmake">Install manpages about the schily makefile system</flag>
- <flag name="schilytools_match">Install match, a grep clone</flag>
- <flag name="schilytools_mdigest">Install mdigest, e.g. covering md5sum sha*sum</flag>
- <flag name="schilytools_mountcd">Install mountcd, a solaris CD comparison tool</flag>
- <flag name="schilytools_obosh">Install obosh (formerly: osh), the original sVr4 (SunOS 5) shell with original bugs</flag>
- <flag name="schilytools_p">Install p, a more program which filters non-printable characters</flag>
- <flag name="schilytools_pbosh">Install pbosh, a shell which implements all POSIX features but only those (compatbilitiy testing!)</flag>
- <flag name="schilytools_paste">Install spaste, a paste clone</flag>
- <flag name="schilytools_patch">Install spatch, a patch clone</flag>
- <flag name="schilytools_pxupgrade">Install pxupgrade: upgrading firmware in Plextor CD/DVD writers</flag>
- <flag name="schilytools_sccs">Install sfind, a source code control system</flag>
- <flag name="schilytools_sfind">Install sfind, a find clone</flag>
- <flag name="schilytools_smake">Install smake, a make clone</flag>
- <flag name="schilytools_star">Install programs provided by app-arch/star</flag>
- <flag name="schilytools_termcap">Install termcap, a termcap compiler</flag>
- <flag name="schilytools_translit">Install translit, a tr clone</flag>
- <flag name="schilytools_udiff">Install udiff, a diff clone</flag>
- <flag name="schilytools_ved">Install ved, a visual editor with features from vi and emacs</flag>
- <flag name="suid">Install rscsi as SUID root</flag>
- </use>
-</pkgmetadata>
diff --git a/app-shells/schily-tools/schily-tools-2021.04.21.ebuild b/app-shells/schily-tools/schily-tools-2021.04.21.ebuild
deleted file mode 100644
index 4ef85f78..00000000
--- a/app-shells/schily-tools/schily-tools-2021.04.21.ebuild
+++ /dev/null
@@ -1,521 +0,0 @@
-# Copyright 2016-2021 Martin V\"ath and Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-inherit fcaps flag-o-matic gnuconfig required-use-warn toolchain-funcs
-
-MY_PV=${PV//./-}
-MY_P="schily-${MY_PV}"
-MY_P_TAR="${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-SRC_URI="mirror://sourceforge/schilytools/${MY_P}.tar.bz2"
-DESCRIPTION="Many tools from Joerg Schilling, including a POSIX compliant Bourne Shell"
-HOMEPAGE="https://sourceforge.net/projects/schilytools/"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl caps doc nls split-usr suid unicode xattr"
-REQUIRED_USE_WARN="amd64-fbsd? ( !xattr )"
-
-PATCHES=("${FILESDIR}"/strlcat-mapvers.patch)
-
-add_iuse_expand() {
- local i j
- j=${1}
- shift
- for i
- do case ${i} in
- +*)
- IUSE=${IUSE}" +${j}_${i#?}";;
- *)
- IUSE=${IUSE}" ${j}_${i}";;
- esac
- done
-}
-add_iuse_expand renameschily \
- +calc +compare +count +getopt +jsh +libschily +man2html +p
-add_iuse_expand schilytools +bosh +calc +calltree +cdrtools \
- +change +compare +copy +count +cpp +cstyle +cut \
- +hdump label +lndir +man2html manmake +match +mdigest mountcd \
- +obosh +p +paste +patch +pbosh pxupgrade +sccs +sfind +smake +star \
- +termcap +translit +udiff +ved
-
-COMMON="!!app-cdr/cdrtools[-schily-tools(-)]
-!!app-arch/star
-!renameschily_libschily? ( !sys-apps/man )
-!renameschily_getopt? ( !sys-apps/man )
-schilytools_calc? (
- !renameschily_calc? ( !sci-mathematics/calc )
-)
-schilytools_compare? (
- !renameschily_compare? (
- !media-gfx/imagemagick !media-gfx/graphicsmagick[imagemagick]
- )
-)
-schilytools_count? (
- !renameschily_count? ( !sys-devel/llvm )
-)
-schilytools_bosh? (
- !renameschily_jsh? ( !app-shells/heirloom-sh )
-)
-schilytools_man2html? (
- !renameschily_man2html? ( !sys-apps/man )
-)
-schilytools_p? (
- !renameschily_p? ( !dev-util/wiggle )
-)
-schilytools_translit? ( !dev-perl/Lingua-Translit )
-acl? ( virtual/acl )
-caps? ( sys-libs/libcap )
-nls? ( virtual/libintl )
-!amd64-fbsd? ( xattr? ( sys-apps/attr ) )"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-BDEPEND="nls? ( >=sys-devel/gettext-0.18.1.1 )"
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-
-pkg_pretend() {
- required-use-warn
-}
-
-# Lot of this code is taken from app-cdr/cdrtools
-
-FILECAPS=(
- cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
- cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
- cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
-)
-
-cdrtools_os() {
- local os="linux"
- [[ ${CHOST} == *-darwin* ]] && os="mac-os10"
- [[ ${CHOST} == *-freebsd* ]] && os="freebsd"
- echo "${os}"
-}
-
-src_schily_prepare() (
- gnuconfig_update
-
- # This fixes a clash with clone() on uclibc. Upstream isn't
- # going to include this so let's try to carry it forward.
- # Contact me if it needs updating. Bug #486782.
- # Anthony G. Basile <blueness@gentoo.org>.
- use elibc_uclibc && eapply "${FILESDIR}"/${PN}-fix-clone-uclibc.patch
-
- # Remove profiled make files.
- find -name '*_p.mk' -delete || die "delete *_p.mk"
-
- # Adjusting hardcoded paths.
- sed -i -e "s|opt/schily|usr|" \
- $(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
- || die "sed opt/schily"
-
- sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \
- $(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \
- || die "sed doc"
-
- # Respect libdir.
- sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \
- $(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/\(siconv\)\?\)\?$' '{}' '+') \
- || die "sed multilib"
-
- # Respect libdir for defaults.smk
- sed -i -e "s|/lib/|/$(get_libdir)/|" \
- smake/Makefile \
- || die "sed multilib for smake"
-
- # Enable verbose build.
- sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
- RULES/*.rul RULES/rules.prg RULES/rules.inc \
- || die "sed verbose rules"
-
- # Respect CC/CXX variables.
- cd "${S}"/RULES || die
- local tcCC=$(tc-getCC)
- local tcCXX=$(tc-getCXX)
- sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
- rules1.top || die "sed rules1.top"
- # -e "s|^\(DEFCCOM_DEF=\).*|\1\t${tcCC}|" \
- sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
- -e "/^CC++_COM_DEF=/s|g[+][+]|${tcCXX}|" \
- -e "/COPTOPT=/s|-O||" \
- -e 's|[$][(]GCCOPTOPT[)]||' \
- -e 's|[$][(]GCC_OPTXX[)]||' \
- cc-gcc.rul || die "sed cc-gcc.rul"
- sed -i -e "/^CC_COM_DEF=/s|clang|${tcCC}|" \
- -e "/^CC++_COM_DEF=/s|clang[+][+]|${tcCXX}|" \
- -e "/COPTOPT=/s|-O||" \
- -e 's|[$][(]CLANGOPTXX[)]||' \
- cc-clang.rul || die "sed cc-clang.rul"
- sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
- rules.cnf || die "sed rules.cnf"
-
- # Schily make setup.
- cd "${S}"/DEFAULTS || die
- local os=$(cdrtools_os)
-
- sed -i \
- -e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
- -e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
- -e "s|^\(LDPATH=\).*|\1|" \
- -e "s|^\(RUNPATH=\).*|\1|" \
- -e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
- -e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
- -e "s|^\(DEFINSGRP=\).*|\1\t0|" \
- -e "s|^\(DEFCCOM=\).*|\1\t${tcCC}|" \
- -e '/^DEFUMASK/s,002,022,g' \
- Defaults.${os} || die "sed Schily make setup"
- # re DEFUMASK above:
- # bug 486680: grsec TPE will block the exec if the directory is
- # group-writable. This is painful with cdrtools, because it makes a bunch of
- # group-writable directories during build. Change the umask on their
- # creation to prevent this.
-)
-
-targets=""
-
-have_target() {
- case " ${targets} " in
- *" ${1} "*)
- return 0;;
- esac
- return 1
-}
-
-targets() {
- local i
- for i
- do have_target "${i}" && continue
- mv -v UNUSED_TARGETS/??"${i}" TARGETS || die
- targets=${targets}${targets:+\ }${i}
- done
-}
-
-src_prepare() {
- filter-flags -fPIE -pie '-flto*' -fwhole-program -fno-common
- src_schily_prepare
- sed -i -e '1s!man1/sh\.1!man1/bosh.1!' -- "${S}/sh/"{jsh,pfsh}.1 || die
- sed -i \
- -e '/-DDO_POSIX_SH/s/^[#]//' \
- -e '/-DDO_POSIX_PATH/s/^/\#/' \
- -e '/[+][=] -DPOSIX_BOSH_PATH/iCPPOPTS += -DPOSIX_BOSH_PATH=\\"'"${EPREFIX}"'/bin/sh\\"' \
- -- "${S}/sh/"Makefile || die
- mkdir UNUSED_TARGETS || die
- mv TARGETS/[0-9][0-9]* UNUSED_TARGETS || die
- targets inc libfind
- targets include libschily libmdigest
- ! use schilytools_bosh || targets sh libxtermcap libshedit libgetopt
- ! use schilytools_calc || targets calc
- ! use schilytools_calltree || targets calltree
- ! use schilytools_change || targets change
- if use schilytools_cdrtools; then
- targets btcflash cdda2wav cdrecord mkisofs 'mkisofs!@!diag' \
- libdeflt libscg 'libscg!@!scg' \
- readcd rscsi scgcheck scgskeleton \
- libcdrdeflt libedc libfile libhfs_iso libparanoia \
- librscg libscgcmd libsiconv 'libsiconv!@!tables'
- fi
- if ! use acl; then
- sed -i -e 's/^CPPOPTS.*DUSE_ACL/#&/' -- star/Makefile || die
- fi
-# nonexistent:
-# ! use schilytools_cmd || targets cmd
- ! use schilytools_compare || targets compare
- ! use schilytools_copy || targets copy
- ! use schilytools_count || targets count
- ! use schilytools_cpp || targets cpp
- ! use schilytools_cstyle || targets cstyle
- ! use schilytools_cut || targets cut
- ! use schilytools_hdump || targets hdump
- ! use schilytools_label || targets label
- ! use schilytools_lndir || targets lndir
- ! use schilytools_man2html || targets man2html
- ! use schilytools_manmake || targets man
- ! use schilytools_match || targets match
- ! use schilytools_mdigest || targets mdigest
- ! use schilytools_mountcd || targets mountcd
- ! use schilytools_obosh || targets obosh libxtermcap libshedit libgetopt
- ! use schilytools_p || targets p libxtermcap
- ! use schilytools_paste || targets paste
- ! use schilytools_patch || targets patch
- ! use schilytools_pbosh || targets pbosh libxtermcap libshedit libgetopt
- ! use schilytools_pxupgrade || targets libdeflt libscg pxupgrade
- ! use schilytools_sccs || targets sccs libgetopt
- ! use schilytools_sfind || targets sfind
- ! use schilytools_smake || targets smake
- if use schilytools_star; then
- targets libdeflt librmt mt rmt star star_sym tartest
- fi
- ! use schilytools_termcap || targets termcap libxtermcap
- ! use schilytools_translit || targets translit
- ! use schilytools_udiff || targets udiff
- ! use schilytools_ved || targets ved libxtermcap
- default
-}
-
-ac_cv_sizeof() {
- cat <<-EOF >"${T}"/test.c
- #include <inttypes.h>
- #include <stddef.h>
- #include <stdint.h>
- #include <sys/types.h>
- int main () {
- static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
- test_array [0] = 0;
- return test_array [0];
- }
- EOF
-
- local i=1
- while [[ ${i} -lt 20 ]] ; do
- if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
- echo ${i}
- return 0
- fi
- : $(( i += 1 ))
- done
- return 1
-}
-
-src_configure() {
- use acl || export ac_cv_header_sys_acl_h="no"
- use caps || export ac_cv_lib_cap_cap_get_proc="no"
- use xattr || export ac_cv_header_attr_xattr_h="no"
- export ac_cv_header_pulse_pulseaudio_h="no"
-
- # skip obsolete configure script
- if tc-is-cross-compiler ; then
- # Cache known values for targets. #486680
-
- tc-export CC
- local var val t types=(
- char "short int" int "long int" "long long"
- "unsigned char" "unsigned short int" "unsigned int"
- "unsigned long int" "unsigned long long"
- float double "long double" size_t ssize_t ptrdiff_t
- mode_t uid_t gid_t pid_t dev_t time_t wchar_t
- "char *" "unsigned char *"
- )
- for t in "${types[@]}" ; do
- var="ac_cv_sizeof_${t// /_}"
- var=${var//[*]/p}
- val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
- export "${var}=${val}"
- einfo "Computing sizeof(${t}) as ${val}"
- done
- # We don't have these types.
- export ac_cv_sizeof___int64=0
- export ac_cv_sizeof_unsigned___int64=0
- export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
- export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
- export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
-
- export ac_cv_type_prototypes="yes"
- export ac_cv_func_mlock{,all}="yes"
- export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
- export ac_cv_func_dtoa_r="no"
- export ac_cv_func_sys_siglist{,_def}="no"
- export ac_cv_func_printf_{j,ll}="yes"
- export ac_cv_realloc_null="yes"
- export ac_cv_no_user_malloc="no"
- export ac_cv_var_timezone="yes"
- export ac_cv_var___progname{,_full}="yes"
- export ac_cv_fnmatch_igncase="yes"
- export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
- export ac_cv_file__usr_src_linux_include="no"
-
- case $(cdrtools_os) in
- linux)
- export ac_cv_func_bsd_{g,s}etpgrp="no"
- export ac_cv_hard_symlinks="yes"
- export ac_cv_link_nofollow="yes"
- export ac_cv_access_e_ok="no"
-
- export ac_cv_dev_minor_noncontig="yes"
- case ${ac_cv_sizeof_long_int} in
- 4) export ac_cv_dev_minor_bits="32";;
- 8) export ac_cv_dev_minor_bits="44";;
- esac
-
- cat <<-EOF >"${T}"/test.c
- struct {
- char start[6];
- unsigned char x1:4;
- unsigned char x2:4;
- char end[5];
- } a = {
- .start = {'S', 't', 'A', 'r', 'T', '_'},
- .x1 = 5,
- .x2 = 4,
- .end = {'_', 'e', 'N', 'd', 'X'},
- };
- EOF
- ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
- if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
- export ac_cv_c_bitfields_htol="no"
- elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
- export ac_cv_c_bitfields_htol="yes"
- fi
- ;;
- esac
- fi
-}
-
-src_compile() {
- if use unicode; then
- local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
- if [[ -n ${flags} ]]; then
- append-flags ${flags}
- else
- ewarn "Your compiler does not support the options required to build"
- ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
- fi
- fi
- append-flags -I"${S}"/libschily
- emake CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
- LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
-}
-
-mustnothave() {
- local i
- for i; do
- test -r "${ED}${i}" && die "${ED}${i} must not exist"
- done
-}
-
-mustremove() {
- local i
- for i; do
- test -r "${ED}${i}" && rm -v -- "${ED}${i}" || \
- die "cannot remove ${ED}${i}"
- done
-}
-
-removedirs() {
- local i
- for i; do
- ! test -d "${ED}${i}" || rm -rfv -- "${ED}${i}" || \
- die "cannot remove ${ED}${i}"
- done
-}
-
-src_install() {
- local i
- ! use doc || dodoc -r Schily.Copyright README.SSPM PORTING CONTRIBUTING \
- AN-????-??-?? ANNOUNCEMENTS READMEs/README.linux
- emake CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
- LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install
- find "${ED}" '(' -name '*.a' '-o' -name '*.so' ')' -delete || die
- use suid || find "$ED" -perm /4000 -exec chmod -v -- -s '{}' '+' || die
- if use schilytools_cdrtools; then
- # These symlinks are for compat with cdrkit.
- dosym schily /usr/include/scsilib
- dosym ../scg /usr/include/schily/scg
-
- cd "${S}"/cdda2wav || die
- docinto cdda2wav
- dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
-
- cd "${S}"/mkisofs || die
- docinto mkisofs
- dodoc ChangeLog* TODO
- fi
- removedirs /usr/include
- if use schilytools_star; then
- removedirs /usr/share/doc/star
- mustremove /usr/bin/{gnu,}tar
- mv -i -- "${ED}"/usr/sbin/rmt{,.star} || die
- fi
- if use schilytools_sccs; then
- mv -v -- "${ED}"/usr/share/man/man1/{,sccs-}diff.1 || die
- else
- ! test -d "${ED}"/usr/ccs || rm -rfv -- "${ED}"/usr/ccs || die
- mustnothave /usr/share/man/man1/diff.1
- fi
- if use schilytools_hdump; then
- mustremove /usr/bin/od /usr/share/man/man1/od.1
- else
- mustnothave /usr/bin/od /usr/share/man/man1/od.1
- fi
- if use schilytools_patch; then
- mustremove /usr/share/man/man1/patch.1
- else
- mustnothave /usr/share/man/man1/patch.1
- fi
- if use schilytools_bosh; then
- dodir bin || die
- rm -v -- "${ED}"/usr/bin/{bo,j,pf}sh \
- "${ED}"/usr/share/man/man1/bosh.1 || die
- rm -rfv -- "${ED}"/usr/xpg4 || die
- mv -v -- "${ED}"/{usr/bin/sh,bin/bosh} || die
- ln -s -- bosh "${ED}"/bin/jsh || die
- ln -s -- bosh "${ED}"/bin/pfsh || die
- mv -v -- "${ED}"/usr/share/man/man1/{,bo}sh.1 || die
- if use renameschily_jsh; then
- mv -v -- "${ED}"/bin/{,s}jsh || die
- mv -v -- "${ED}"/usr/share/man/man1/{,s}jsh.1 || die
- fi
- fi
- if use schilytools_calc && use renameschily_calc; then
- mv -v -- "${ED}"/usr/bin/{,s}calc || die
- mv -v -- "${ED}"/usr/share/man/man1/{,s}calc.1 || die
- fi
- if use schilytools_compare && use renameschily_compare; then
- mv -v -- "${ED}"/usr/bin/{,s}compare || die
- mv -v -- "${ED}"/usr/share/man/man1/{,s}compare.1 || die
- fi
- if use schilytools_count && use renameschily_count; then
- mv -v -- "${ED}"/usr/bin/{,s}count || die
- mv -v -- "${ED}"/usr/share/man/man1/{,s}count.1 || die
- fi
- if use schilytools_man2html && use renameschily_man2html; then
- mv -v -- "${ED}"/usr/bin/{,s}man2html || die
- mv -v -- "${ED}"/usr/share/man/man1/{,s}man2html.1 || die
- fi
- if use schilytools_p && use renameschily_p; then
- mv -v -- "${ED}"/usr/bin/{,s}p || die
- mv -v -- "${ED}"/usr/share/man/man1/{,s}p.1 || die
- fi
- if use schilytools_ved; then
- docompress -x /usr/share/man/help
- fi
- if use renameschily_libschily; then
- for i in error fexecve fnmatch getline {,f,s}printf strlen; do
- mv -v -- "${ED}"/usr/share/man/man3/{,schily-}${i}.3 || die
- done
- fi
- if use renameschily_getopt && have_target libgetopt; then
- mv -v -- "${ED}"/usr/share/man/man3/{,schily-}getopt.3 || die
- mv -v -- "${ED}"/usr/share/man/man3/{,schily-}getsubopt.3 || die
- fi
- use split-usr || move_to_usr_bin "${ED}"/bin/*
- if test -d "${ED}"/usr/etc
- then
- dodir etc
- mv -v -- "${ED}"/usr/etc/* "${ED}"/etc
- rmdir -- "${ED}"/usr/etc
- fi
-}
-
-move_to_usr_bin() {
- test -r "$1" || return 0
- test -d "${ED}"/usr/bin || mkdir -p -- "${ED}"/usr/bin || die
- mv -v -- "$@" "${ED}"/usr/bin || die
- rmdir "${ED}"/bin || die
-}
-
-pkg_postinst() {
- use schilytools_cdrtools || return 0
- fcaps_pkg_postinst
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- einfo
- einfo "Darwin/OS X use the following device names:"
- einfo
- einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
- einfo
- einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
- einfo
- fi
-}
diff --git a/app-shells/set_prompt/ChangeLog b/app-shells/set_prompt/ChangeLog
new file mode 100644
index 00000000..7c799a44
--- /dev/null
+++ b/app-shells/set_prompt/ChangeLog
@@ -0,0 +1,135 @@
+# ChangeLog for app-shells/set_prompt
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*set_prompt-1.22 (06 Sep 2015)
+
+ 06 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*set_prompt-1.21 (12 Jun 2015)
+
+ 12 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*set_prompt-1.20 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*set_prompt-1.19 (30 Aug 2014)
+
+ 30 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*set_prompt-1.17-r1 (17 Dec 2013)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix sh path
+
+*set_prompt-1.17 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*set_prompt-1.16 (03 Nov 2013)
+
+ 03 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*set_prompt-1.15 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Shebang care
+
+*set_prompt-1.14 (07 Jun 2013)
+
+ 07 Jun 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*set_prompt-1.13 (02 Jun 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 04 Jun 2012; Martin Väth <martin@mvath.de>:
+ Fix description
+
+ 02 Jun 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*set_prompt-1.12 (14 May 2012)
+
+ 14 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*set_prompt-1.11 (07 May 2012)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*set_prompt-1.10 (12 Apr 2012)
+
+ 04 May 2012; Martin Väth <martin@mvath.de>:
+ Fix permissions
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 12 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Make -r really not rely on external
+ variables and more readable. Improve parsing of git output
+
+*set_prompt-1.8 (10 Apr 2012)
+
+ 10 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*set_prompt-1.7 (08 Apr 2012)
+
+ 08 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*set_prompt-1.6 (10 Mar 2012)
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 10 Mar 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Security Update. See the new README
+
+*set_prompt-1.5 (08 Mar 2012)
+
+ 08 Mar 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Security Update. See the new README
+
+*set_prompt-1.4 (28 Feb 2012)
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*set_prompt-1.3 (19 Feb 2012)
+
+ 19 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*set_prompt-1.2 (18 Feb 2012)
+
+ 18 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump. Code cleanup. Improved docu/help. Require $backslash
+
+*set_prompt-1.1 (18 Feb 2012)
+
+ 18 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump. Customizable maxlen, leftmin. Readable (-r) output
+
+*set_prompt-1.0 (17 Feb 2012)
+
+ 17 Feb 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/app-shells/set_prompt/Manifest b/app-shells/set_prompt/Manifest
index 745a15e9..12db831c 100644
--- a/app-shells/set_prompt/Manifest
+++ b/app-shells/set_prompt/Manifest
@@ -1 +1 @@
-DIST set_prompt-3.2.tar.gz 8029 SHA512 d031564c1816717485206a09842ce95ee732db6fd2e100c7571d8c043afd7d15bfe91957fcd826d3cd1cf30e2507afdc726fb3beb21c661e834d57e71a1b34d4
+DIST set_prompt-1.22.tar.gz 7981 SHA256 7dd9023da52099d60da7c4e0faca99aa421355c605c713371f2de9fad1d54596 SHA512 48b99c3e611297127059effdc1dadd9b1c50f8d7047922a75368780ea632c4e884cf537c5fa97f668cb7151764b9d42365bbf16c5c87ce612ebcc3881d7ccbb7 WHIRLPOOL 3cbe1b2f9dd0c277c0351165aa1a2d464337f31483dbd0d0629af4fc25490389bb7b1da111779d3bd35ae9de408ab5168a33e345c2e42bec4a8326253c2cb17f
diff --git a/app-shells/set_prompt/metadata.xml b/app-shells/set_prompt/metadata.xml
index 1923b953..a7fc3713 100644
--- a/app-shells/set_prompt/metadata.xml
+++ b/app-shells/set_prompt/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-shells/set_prompt/set_prompt-1.22.ebuild b/app-shells/set_prompt/set_prompt-1.22.ebuild
new file mode 100644
index 00000000..94a9288d
--- /dev/null
+++ b/app-shells/set_prompt/set_prompt-1.22.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils
+
+DESCRIPTION="An intelligent prompt for zsh or bash with status line (window title) support"
+HOMEPAGE="https://github.com/vaeth/set_prompt/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+ use prefix || sed -i \
+ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}"'/bin/sh"' \
+ -e '1s"^#!/usr/bin/env zsh$"#!'"${EPREFIX}"'/bin/zsh"' \
+ -- * || die
+ epatch_user
+}
+
+src_install() {
+ insinto /etc
+ doins set_prompt.config
+ insinto /usr/bin
+ doins set_prompt.sh git_prompt.zsh
+ dobin set_prompt git_update
+ dodoc README
+}
diff --git a/app-shells/set_prompt/set_prompt-3.2.ebuild b/app-shells/set_prompt/set_prompt-3.2.ebuild
deleted file mode 100644
index cb60f980..00000000
--- a/app-shells/set_prompt/set_prompt-3.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2012-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="An intelligent prompt for zsh or bash with status line (window title) support"
-HOMEPAGE="https://github.com/vaeth/set_prompt/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_prepare() {
- use prefix || sed -i \
- -e '1s"^#!/usr/bin/env "#!'"${EPREFIX}"'/bin/"' \
- -- bin/* || die
- default
-}
-
-src_install() {
- insinto /etc
- doins bin/*.config
- insinto /usr/bin
- dobin bin/*.sh bin/*.zsh bin/set_prompt bin/git_update
- insinto /usr/share/zsh/site-functions
- doins zsh/*
- dodoc README.md
-}
diff --git a/app-shells/termcolors-mv/ChangeLog b/app-shells/termcolors-mv/ChangeLog
new file mode 100644
index 00000000..55c4193b
--- /dev/null
+++ b/app-shells/termcolors-mv/ChangeLog
@@ -0,0 +1,89 @@
+# ChangeLog for app-shells/termcolors-mv
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*termcolors-3.11 (05 Sep 2015)
+
+ 05 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*termcolors-3.10 (24 Jul 2015)
+
+ 24 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*termcolors-3.9 (18 Jul 2015)
+
+ 18 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*termcolors-3.8 (12 Jul 2015)
+
+ 12 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*termcolors-3.7 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*termcolors-3.6 (29 May 2015)
+
+ 29 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*termcolors-3.5 (03 May 2015)
+
+ 03 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*termcolors-3.4 (04 Jul 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 04 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*termcolors-3.3 (16 Mar 2014)
+
+ 16 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Add ebooks
+
+*termcolors-3.2-r1 (17 Dec 2013)
+
+ 24 Jan 2014; Martin Väth <martin@mvath.de>:
+ Avoid duplicate installation
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix sh and perl paths
+
+*termcolors-3.2 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*termcolors-3.1 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Shebang care
+
+*termcolors-3.0 (07 Aug 2013)
+
+ 12 Oct 2013; Martin Väth <martin@mvath.de>:
+ Use readme.gentoo.eclass
+
+ 07 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*termcolors-2.0 (23 Mar 2013)
+
+ 23 Mar 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+ Support solarized if SOLARIZED is set for the new dircolors wrapper
+ No file collisions anymore. Make 256colors perl script optional
+
+*termcolors-1.1 (06 Jan 2013)
+
+ 06 Jan 2013; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/app-shells/termcolors-mv/Manifest b/app-shells/termcolors-mv/Manifest
index 1866c3bc..85b3f608 100644
--- a/app-shells/termcolors-mv/Manifest
+++ b/app-shells/termcolors-mv/Manifest
@@ -1 +1 @@
-DIST termcolors-mv-4.8.tar.gz 9183 SHA512 9ff5f7640bce10ec97518bcd5f6e379736f18a251c18f93e07d545d041eed38593016b0585baa2f41558a0988dd12a43f07b9ec2930cc5cc37e8502f25dd49e4
+DIST termcolors-mv-3.11.tar.gz 7821 SHA256 d2938b2e6e9080782c71e355090cc1f14ada6fa43b8c5dd866422545603f4489 SHA512 c8784352f5d6652fe358ee65d5481cc146b8ee57a83b20f7af5a1a3864b17230244e03e8e6a60e9e65ac3323db3ad2a82b3621416dddf342399a73b848965fbe WHIRLPOOL a646b0b0c8961f826d3c578c24fc4528186da2240d112753906584aace574c5e682ed3520ce5c6c84014f9a0c6b4323ef0dcd9eca7998f6369c477b8e2c62d01
diff --git a/app-shells/termcolors-mv/metadata.xml b/app-shells/termcolors-mv/metadata.xml
index db7ae27d..afa70177 100644
--- a/app-shells/termcolors-mv/metadata.xml
+++ b/app-shells/termcolors-mv/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
@@ -16,6 +16,5 @@
<use>
<flag name="create">Install DIR_COLORS-create perl script</flag>
<flag name="perl">Install 256colors perl script</flag>
- <flag name="poor">Install poor man's variant which does not require coreutils-8.25 or newer</flag>
</use>
</pkgmetadata>
diff --git a/app-shells/termcolors-mv/termcolors-mv-4.8.ebuild b/app-shells/termcolors-mv/termcolors-mv-3.11.ebuild
index a5edc8ae..dddc447e 100644
--- a/app-shells/termcolors-mv/termcolors-mv-4.8.ebuild
+++ b/app-shells/termcolors-mv/termcolors-mv-3.11.ebuild
@@ -1,18 +1,19 @@
-# Copyright 2013-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
-inherit readme.gentoo-r1
+inherit eutils readme.gentoo
DESCRIPTION="256colors sample script and dircolors configuration for standard or 256 colors"
HOMEPAGE="https://github.com/vaeth/termcolors-mv/"
SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
+LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="create +perl poor"
+KEYWORDS="~amd64 ~x86"
+IUSE="create +perl"
DEPEND="dev-lang/perl"
RDEPEND="create? ( dev-lang/perl )
perl? ( dev-lang/perl )"
@@ -29,23 +30,19 @@ src_prepare() {
-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
-- bin/* || die
- default
+ epatch_user
}
src_compile() {
- perl bin/DIR_COLORS-create $(usex poor poor '')
+ perl bin/DIR_COLORS-create
}
src_install() {
- dodoc README.md
+ dodoc README
dobin bin/dircolors-mv
use create && dobin bin/DIR_COLORS-create
use perl && dobin bin/256colors
- insinto /usr/lib/dir_colors
+ insinto /etc/dir_colors
doins DIR_COLORS*
readme.gentoo_create_doc
}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-shells/zsh-autosuggestions/Manifest b/app-shells/zsh-autosuggestions/Manifest
deleted file mode 100644
index e1b56da8..00000000
--- a/app-shells/zsh-autosuggestions/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zsh-autosuggestions-0.6.4.tar.gz 29154 SHA512 226b99048577ecdbe198501e6e4b3156c3d849994f0a2f7e15687cd244d4cac472cbcf746aaa32b2886652f6962852a475777b5f2bfcb3a6d0279be98a6020bb
diff --git a/app-shells/zsh-autosuggestions/metadata.xml b/app-shells/zsh-autosuggestions/metadata.xml
deleted file mode 100644
index 3432e56a..00000000
--- a/app-shells/zsh-autosuggestions/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <bugs-to>https://github.com/zsh-users/zsh-autosuggestions/issues</bugs-to>
- <remote-id type="github">zsh-users/zsh-autosuggestions</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.4.ebuild b/app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.4.ebuild
deleted file mode 100644
index 85a2438b..00000000
--- a/app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2011-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-RESTRICT="mirror"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-case ${PV} in
-99999999*)
- EGIT_REPO_URI="https://github.com/zsh-users/zsh-autosuggestions"
- EGIT_BRANCH="develop"
- inherit git-r3
- PROPERTIES="live"
- SRC_URI=""
- KEYWORDS="";;
-*alpha*)
- EGIT_COMMIT="7afb7364f1ba5cb87eb616516c9a7fa4b86539b6"
- SRC_URI="https://github.com/zsh-users/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
-*)
- SRC_URI="https://github.com/zsh-users/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz";;
-esac
-
-DESCRIPTION="Fish-like autosuggestions for zsh"
-HOMEPAGE="https://github.com/zsh-users/zsh-autosuggestions/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-shells/zsh"
-DEPEND=""
-
-src_install() {
- local DISABLE_AUTOFORMATTING DOC_CONTENTS dir
- dir="/usr/share/zsh/site-contrib/${PN}"
- DISABLE_AUTOFORMATTING="true"
- DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
-. ${EPREFIX}${dir}/zsh-autosuggestions.zsh"'
-at the end of your ~/.zshrc
-For testing, you can also execute the above command in your zsh.'
- readme.gentoo_create_doc
- insinto "${dir}"
- doins *.zsh
- doins -r spec src
- dodoc *.md
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-shells/zsh-autosuggestions/zsh-autosuggestions-99999999.ebuild b/app-shells/zsh-autosuggestions/zsh-autosuggestions-99999999.ebuild
deleted file mode 100644
index 85a2438b..00000000
--- a/app-shells/zsh-autosuggestions/zsh-autosuggestions-99999999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2011-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-RESTRICT="mirror"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-case ${PV} in
-99999999*)
- EGIT_REPO_URI="https://github.com/zsh-users/zsh-autosuggestions"
- EGIT_BRANCH="develop"
- inherit git-r3
- PROPERTIES="live"
- SRC_URI=""
- KEYWORDS="";;
-*alpha*)
- EGIT_COMMIT="7afb7364f1ba5cb87eb616516c9a7fa4b86539b6"
- SRC_URI="https://github.com/zsh-users/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
-*)
- SRC_URI="https://github.com/zsh-users/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz";;
-esac
-
-DESCRIPTION="Fish-like autosuggestions for zsh"
-HOMEPAGE="https://github.com/zsh-users/zsh-autosuggestions/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-shells/zsh"
-DEPEND=""
-
-src_install() {
- local DISABLE_AUTOFORMATTING DOC_CONTENTS dir
- dir="/usr/share/zsh/site-contrib/${PN}"
- DISABLE_AUTOFORMATTING="true"
- DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
-. ${EPREFIX}${dir}/zsh-autosuggestions.zsh"'
-at the end of your ~/.zshrc
-For testing, you can also execute the above command in your zsh.'
- readme.gentoo_create_doc
- insinto "${dir}"
- doins *.zsh
- doins -r spec src
- dodoc *.md
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-shells/zsh-completions/ChangeLog b/app-shells/zsh-completions/ChangeLog
new file mode 100644
index 00000000..7d7493f2
--- /dev/null
+++ b/app-shells/zsh-completions/ChangeLog
@@ -0,0 +1,46 @@
+# ChangeLog for app-shells/zsh-completions
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*zsh-completions-99999999 (12 Apr 2015)
+
+ 12 Apr 2015; Martin Väth <martin@mvath.de>:
+ Update to new/removed completion files. Simplify separation of life version
+
+*zsh-completions-0.12.0 (26 Sep 2014)
+
+ 26 Sep 2014; Martin Väth <martin@mvath.de>:
+ Rename package. Update ebuild logic. Version bump, remove old ebuild
+
+*zsh-completion-20150716 (06 Aug 2014)
+
+ 06 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zsh-completion-20130808 (09 Aug 2013)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball. Fix IUSE
+
+ 01 Dec 2013; Martin Väth <martin@mvath.de>:
+ Update to new completion files. Auto-enable and restructure COMPLETION=...
+
+ 06 Nov 2013; Martin Väth <martin@mvath.de>:
+ Update to new completion files
+
+ 03 Oct 2013; Martin Väth <martin@mvath.de>:
+ Update to new completion files
+
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Bump to git-r3.eclass
+
+ 09 Aug 2013; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild. Add new completion files to USE
+
+*zsh-completion-0.8.0, zsh-completion-99999999 (28 Jan 2013)
+
+ 07 Jun 2013; Martin Väth <martin@mvath.de>:
+ Update live ebuild to new upstream completions
+
+ 28 Jan 2013; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
new file mode 100644
index 00000000..eec029ad
--- /dev/null
+++ b/app-shells/zsh-completions/Manifest
@@ -0,0 +1 @@
+DIST zsh-completions-0.12.0.tar.gz 193410 SHA256 770d92749b11b22192595b207208508f8bfa319d5d03210a71bc44c8b9cfa0d5 SHA512 3c6b19f10d9598f40cf37ca5c5828e5652b0cad144d48ca681f5a16c1921c308f8cd3d9b8a2dd1c50ddbf167d4bb2e2e5299d1e30591971f4c7d9b28c2250feb WHIRLPOOL 7c5a1cb45d2e045fb0f8eb64deb8d87cab506f11b94996b9ff6cb169fd20672040bdc624de78a58ab5908d2222130de93a179a8e00d5aa75365af0ab0566852a
diff --git a/app-shells/zsh-completions/metadata.xml b/app-shells/zsh-completions/metadata.xml
new file mode 100644
index 00000000..cb5fb51b
--- /dev/null
+++ b/app-shells/zsh-completions/metadata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>martin@mvath.de</email>
+ <name>Martin Väth</name>
+ </maintainer>
+ <upstream>
+ <maintainer>
+ <email></email>
+ <name>zsh-users</name>
+ </maintainer>
+ <remote-id type="github">zsh-users/zsh-completions</remote-id>
+ </upstream>
+ <use>
+ <flag name="completion_Android">Install zsh completions for Android-related programs</flag>
+ <flag name="completion_Google">Install zsh completions for googlecl</flag>
+ <flag name="completion_Unix">Install zsh completion for unix system tools</flag>
+ <flag name="completion_database">Install zsh completions for database programs</flag>
+ <flag name="completion_dev">Install zsh completions for development (build systems, editors, web)</flag>
+ <flag name="completion_disk">Install zsh completions for disk tools</flag>
+ <flag name="completion_distribute">Install zsh completions for tools for distributing tasks to machines</flag>
+ <flag name="completion_filesystem">Install zsh completions for filesystem tools</flag>
+ <flag name="completion_git">Install zsh completions for special git tools</flag>
+ <flag name="completion_hardware">Install zsh completions for low-level hardware tools</flag>
+ <flag name="completion_haskell">Install zsh completions for Haskell tools</flag>
+ <flag name="completion_managers">Install zsh completions for package managers (not portage)</flag>
+ <flag name="completion_multimedia">Install zsh completions for multimedia programs</flag>
+ <flag name="completion_net">Install zsh completions for net-related tools</flag>
+ <flag name="completion_nfs">Install zsh completions for network filesystem tools</flag>
+ <flag name="completion_perl">Install zsh completion for perl-related tools</flag>
+ <flag name="completion_pip">Install zsh completion for dev-python/pip (instead of completion of dev-python/pip project)</flag>
+ <flag name="completion_python">Install zsh completion for python development tools</flag>
+ <flag name="completion_ruby">Install zsh completion for ruby tools and tools in ruby</flag>
+ <flag name="completion_search">Install zsh completion for search tools like sys-apps/ack and sys-apps/the_silver_searcher</flag>
+ <flag name="completion_session">Install zsh completion for session-handling frontends</flag>
+ <flag name="completion_subtitles">Install zsh completion for subtitle tools</flag>
+ <flag name="completion_virtualization">Install zsh completion for virtualization programs</flag>
+ <flag name="completion_web">Install zsh completion for web-related tools incl. java/javascript/scala</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-shells/zsh-completions/zsh-completions-0.12.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.12.0.ebuild
new file mode 100644
index 00000000..51991693
--- /dev/null
+++ b/app-shells/zsh-completions/zsh-completions-0.12.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+case ${PV} in
+99999999*)
+ LIVE=:
+ EGIT_REPO_URI="git://github.com/zsh-users/${PN}.git"
+ inherit git-r3
+ PROPERTIES="live"
+ KEYWORDS=""
+ SRC_URI="";;
+*)
+ LIVE=false
+ RESTRICT="mirror"
+ TARBALL_VERSION='0.12.0'
+ SRC_URI="https://github.com/zsh-users/${PN}/archive/${TARBALL_VERSION}.tar.gz -> ${PN}-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${PN}-${TARBALL_VERSION}"
+esac
+
+DESCRIPTION="Additional completion definitions for Zsh"
+HOMEPAGE="https://gentoo.org/zsh-users/zsh-completions/"
+LICENSE="ZSH"
+SLOT="0"
+if ${LIVE}
+then DEPEND=""
+else DEPEND="completion_pip? ( !dev-python/pip[zsh-completion] )"
+fi
+
+IUSE=""
+declare -a FILES
+FILES=()
+declare -A USEFILE FILEINDEX
+USEFILE=()
+FILEINDEX=()
+used_value() {
+ case ${!1} in
+ '*'*)
+ eval ${1}=\${${1}#?}
+ ${LIVE};;
+ '/'*)
+ eval ${1}=\${${1}#?}
+ ! ${LIVE};;
+ esac
+}
+calculate_data() {
+ local comp curr currfile used
+ for comp
+ do curr="${comp%% *}"
+ used_value curr || continue
+ case ${curr} in
+ '+'*)
+ curr="completion_${curr#?}"
+ IUSE="${IUSE}${IUSE:+ }+${curr}";;
+ *)
+ curr="completion_${curr}"
+ IUSE="${IUSE}${IUSE:+ }${curr}";;
+ esac
+ for currfile in ${comp#* }
+ do used_value currfile
+ used=${?}
+ USEFILE["${currfile}"]="${curr}"
+ [[ -z ${FILEINDEX["${currfile}"]} ]] || die "${currfile} listed twice"
+ [ ${used} -ne 0 ] && continue
+ FILEINDEX["${currfile}"]="${#FILES[@]}"
+ FILES+=("${currfile}")
+ done
+ done
+}
+calculate_data \
+ '+Android _adb _android _emulator' \
+ '+Google _google' \
+ '+Unix _cmake _dzen2 _logger _nl _ps _shutdown _watch _xinput' \
+ '+database _redis-cli _pgsql_utils' \
+ '+dev _artisan _choc _console _gradle _geany _phing _manage.py _mvn _pear _play _symfony _thor _vagrant _veewee' \
+ '+disk _sdd _smartmontools _srm' \
+ '+distribute _celery /_envoy _fab _glances _kitchen _knife _mina _mussh' \
+ '+filesystem _zfs' \
+ '+git _git-flow _git-pulls' \
+ '+hardware _optirun _perf _primus' \
+ '+haskell _cabal _ghc' \
+ '+managers _bower _brew *_cask _debuild _lein _pactree _pkcon _port _yaourt' \
+ '+multimedia _id3 _id3v2 _showoff' \
+ '+net _dget _dhcpcd _httpie _iw _mosh _rfkill _socat _ssh-copy-id _vpnc _vnstat' \
+ '+nfs _exportfs' \
+ '+perl _cpanm' \
+ '/+pip _pip' \
+ '+python _bpython _pygmentize _setup.py' \
+ '+ruby _bundle _cap _ditz _gas _gem _gist _github _git-wtf _jekyll _lunchy _rails _rspec _rubocop _rvm' \
+ '+search _ack _ag _jq' \
+ '+session _atach _teamocil _tmuxinator _wemux' \
+ '+subtitles _language_codes _periscope _subliminal' \
+ '+virtualization _boot2docker *_docker-machine /_docker _virtualbox _virsh' \
+ '+web _coffee _composer _docpad _drush _heroku *_hledger _jonas _jmeter _jmeter-plugins _lunar _middleman _node _nvm _ralio _salt _sbt _scala _svm'
+
+src_prepare() {
+ epatch_user
+}
+
+src_install() {
+ insinto /usr/share/zsh/site-functions
+ local i j u
+ for i in src/*
+ do j=${i#src/}
+ u=${USEFILE["${j}"]}
+ if [ -z "${u}" ]
+ then elog "installing unknown completion ${i#*/}"
+ doins "${i}"
+ continue
+ fi
+ ! use "${u}" || doins "${i}"
+ u=${FILEINDEX["${j}"]}
+ FILES[${u}]=
+ done
+ for i in ${FILES[*]}
+ do elog "listed file ${i} not found"
+ done
+ dodoc README.md zsh-completions-howto.org
+}
diff --git a/app-shells/zsh-completions/zsh-completions-99999999.ebuild b/app-shells/zsh-completions/zsh-completions-99999999.ebuild
new file mode 100644
index 00000000..51991693
--- /dev/null
+++ b/app-shells/zsh-completions/zsh-completions-99999999.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+case ${PV} in
+99999999*)
+ LIVE=:
+ EGIT_REPO_URI="git://github.com/zsh-users/${PN}.git"
+ inherit git-r3
+ PROPERTIES="live"
+ KEYWORDS=""
+ SRC_URI="";;
+*)
+ LIVE=false
+ RESTRICT="mirror"
+ TARBALL_VERSION='0.12.0'
+ SRC_URI="https://github.com/zsh-users/${PN}/archive/${TARBALL_VERSION}.tar.gz -> ${PN}-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${PN}-${TARBALL_VERSION}"
+esac
+
+DESCRIPTION="Additional completion definitions for Zsh"
+HOMEPAGE="https://gentoo.org/zsh-users/zsh-completions/"
+LICENSE="ZSH"
+SLOT="0"
+if ${LIVE}
+then DEPEND=""
+else DEPEND="completion_pip? ( !dev-python/pip[zsh-completion] )"
+fi
+
+IUSE=""
+declare -a FILES
+FILES=()
+declare -A USEFILE FILEINDEX
+USEFILE=()
+FILEINDEX=()
+used_value() {
+ case ${!1} in
+ '*'*)
+ eval ${1}=\${${1}#?}
+ ${LIVE};;
+ '/'*)
+ eval ${1}=\${${1}#?}
+ ! ${LIVE};;
+ esac
+}
+calculate_data() {
+ local comp curr currfile used
+ for comp
+ do curr="${comp%% *}"
+ used_value curr || continue
+ case ${curr} in
+ '+'*)
+ curr="completion_${curr#?}"
+ IUSE="${IUSE}${IUSE:+ }+${curr}";;
+ *)
+ curr="completion_${curr}"
+ IUSE="${IUSE}${IUSE:+ }${curr}";;
+ esac
+ for currfile in ${comp#* }
+ do used_value currfile
+ used=${?}
+ USEFILE["${currfile}"]="${curr}"
+ [[ -z ${FILEINDEX["${currfile}"]} ]] || die "${currfile} listed twice"
+ [ ${used} -ne 0 ] && continue
+ FILEINDEX["${currfile}"]="${#FILES[@]}"
+ FILES+=("${currfile}")
+ done
+ done
+}
+calculate_data \
+ '+Android _adb _android _emulator' \
+ '+Google _google' \
+ '+Unix _cmake _dzen2 _logger _nl _ps _shutdown _watch _xinput' \
+ '+database _redis-cli _pgsql_utils' \
+ '+dev _artisan _choc _console _gradle _geany _phing _manage.py _mvn _pear _play _symfony _thor _vagrant _veewee' \
+ '+disk _sdd _smartmontools _srm' \
+ '+distribute _celery /_envoy _fab _glances _kitchen _knife _mina _mussh' \
+ '+filesystem _zfs' \
+ '+git _git-flow _git-pulls' \
+ '+hardware _optirun _perf _primus' \
+ '+haskell _cabal _ghc' \
+ '+managers _bower _brew *_cask _debuild _lein _pactree _pkcon _port _yaourt' \
+ '+multimedia _id3 _id3v2 _showoff' \
+ '+net _dget _dhcpcd _httpie _iw _mosh _rfkill _socat _ssh-copy-id _vpnc _vnstat' \
+ '+nfs _exportfs' \
+ '+perl _cpanm' \
+ '/+pip _pip' \
+ '+python _bpython _pygmentize _setup.py' \
+ '+ruby _bundle _cap _ditz _gas _gem _gist _github _git-wtf _jekyll _lunchy _rails _rspec _rubocop _rvm' \
+ '+search _ack _ag _jq' \
+ '+session _atach _teamocil _tmuxinator _wemux' \
+ '+subtitles _language_codes _periscope _subliminal' \
+ '+virtualization _boot2docker *_docker-machine /_docker _virtualbox _virsh' \
+ '+web _coffee _composer _docpad _drush _heroku *_hledger _jonas _jmeter _jmeter-plugins _lunar _middleman _node _nvm _ralio _salt _sbt _scala _svm'
+
+src_prepare() {
+ epatch_user
+}
+
+src_install() {
+ insinto /usr/share/zsh/site-functions
+ local i j u
+ for i in src/*
+ do j=${i#src/}
+ u=${USEFILE["${j}"]}
+ if [ -z "${u}" ]
+ then elog "installing unknown completion ${i#*/}"
+ doins "${i}"
+ continue
+ fi
+ ! use "${u}" || doins "${i}"
+ u=${FILEINDEX["${j}"]}
+ FILES[${u}]=
+ done
+ for i in ${FILES[*]}
+ do elog "listed file ${i} not found"
+ done
+ dodoc README.md zsh-completions-howto.org
+}
diff --git a/app-shells/zsh-syntax-highlighting/ChangeLog b/app-shells/zsh-syntax-highlighting/ChangeLog
new file mode 100644
index 00000000..58c73365
--- /dev/null
+++ b/app-shells/zsh-syntax-highlighting/ChangeLog
@@ -0,0 +1,64 @@
+# ChangeLog for app-shells/zsh-syntax-highlighting
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*zsh-syntax-highlighting-0.2.1 (25 Sep 2014)
+
+ 25 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump. Remove old ebuild
+
+*zsh-syntax-highlighting-0.2.0, -99999999 (14 Sep 2013)
+
+ 24 Jan 2014; Martin Väth <martin@mvath.de>:
+ Avoid duplicate installation
+
+ 20 Nov 2013; Martin Väth <martin@mvath.de>:
+ Fix check for patching
+
+ 12 Oct 2013; Martin Väth <martin@mvath.de>:
+ Use readme.gentoo.eclass
+
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Rename back. Bump to git-r3.eclass
+
+*zsh-syntax-highlighting-0.2.0-r1 (10 Aug 2013)
+
+ 10 Aug 2013; Martin Väth <martin@mvath.de>:
+ Fix userspace pollution by cdpath_dir
+
+*zsh-syntax-highlighting-0.2.0 (09 Aug 2013)
+
+ 09 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump. Remove old ebuild
+
+*zsh-syntax-highlighting-0.1.2-r1, -99999999-r1 (19 Jan 2013)
+
+ 19 Jan 2013; Martin Väth <martin@mvath.de>:
+ Change install location, remove old ebuilds.
+
+*zsh-syntax-highlighting-0.1.2 (17 Aug 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 18 Aug 2012; Martin Väth <martin@mvath.de>:
+ Add RESTRICT="mirror" for non-live ebuild
+
+ 17 Aug 2012; Martin Väth <martin@mvath.de>:
+ Provide non-live ebuild
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 06 Nov 2011; Martin Väth <martin@mvath.de>:
+ Use default EGIT_PROJECT name. Call EGIT_REPACK unless offline.
+
+ 09 Sep 2011; Martin Väth <martin@mvath.de>:
+ Update addresses and port to git-2 eclass.
+ Note that ESCM_OFLINE/EGIT_OFFLINE is named EVCS_OFFLINE in git-2.
+
+ 03 Jun 2011; Martin Väth <martin@mvath.de>:
+ Write ebuild from scratch.
diff --git a/app-shells/zsh-syntax-highlighting/Manifest b/app-shells/zsh-syntax-highlighting/Manifest
index a7d9e32a..020adc4e 100644
--- a/app-shells/zsh-syntax-highlighting/Manifest
+++ b/app-shells/zsh-syntax-highlighting/Manifest
@@ -1 +1 @@
-DIST zsh-syntax-highlighting-0.8.0_alpha1.tar.gz 150914 SHA512 6a8ea5c181cbeae2fb538be50d07a5391fe7a454331b06a73ba266cd5f2b64a5f98f8d086ee2fa9e4994044686341eaccaa1ba48fcea5eee544f119b3ddf396a
+DIST zsh-syntax-highlighting-0.2.1.tar.gz 12400 SHA256 3cdf47ee613ff748230e9666c0122eca22dc05352f266fe640019c982f3ef6db SHA512 40b04f45035081858d14d8044659db3e96e881e387c91564ff58314972207a47145f13ecdb604c0a7a5683c0a922811c4ee36e3d18558c6126db24b5da2d862c WHIRLPOOL 7707bd843d77bf53bd2aef4260a683fe8de6fb0529d9c58e7780b43131eda4541054165c3cd5e69f8d04721d2264a60233f4efda6958af819d1345e19dc715bb
diff --git a/app-shells/zsh-syntax-highlighting/metadata.xml b/app-shells/zsh-syntax-highlighting/metadata.xml
index 080f741d..a1caaddd 100644
--- a/app-shells/zsh-syntax-highlighting/metadata.xml
+++ b/app-shells/zsh-syntax-highlighting/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.1.ebuild
new file mode 100644
index 00000000..be2a231c
--- /dev/null
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils readme.gentoo
+
+case ${PV} in
+99999999*)
+ EGIT_REPO_URI="git://github.com/zsh-users/${PN}.git"
+ inherit git-r3
+ PROPERTIES="live"
+ SRC_URI=""
+ KEYWORDS="";;
+*)
+ RESTRICT="mirror"
+ SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86";;
+esac
+
+DESCRIPTION="Fish shell like syntax highlighting for zsh"
+HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting"
+
+LICENSE="HPND"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-shells/zsh"
+DEPEND=""
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
+. /usr/share/zsh/site-contrib/${PN}/zsh-syntax-highlighting.zsh
+at the end of your ~/.zshrc
+For testing, you can also execute the above command in your zsh."
+
+src_prepare() {
+ grep -q 'local .*cdpath_dir' \
+ "${S}/highlighters/main/main-highlighter.zsh" >/dev/null 2>&1 || \
+ sed -i -e '/for cdpath_dir/ilocal cdpath_dir' \
+ -- "${S}/highlighters/main/main-highlighter.zsh" || die
+ epatch_user
+}
+
+src_install() {
+ dodoc *.md
+ insinto /usr/share/zsh/site-contrib/${PN}
+ doins *.zsh
+ doins -r highlighters
+ readme.gentoo_create_doc
+}
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.8.0_alpha1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.8.0_alpha1.ebuild
deleted file mode 100644
index 9bd9562e..00000000
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.8.0_alpha1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2011-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-RESTRICT="mirror"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-case ${PV} in
-99999999*)
- EGIT_REPO_URI="https://github.com/zsh-users/${PN}.git"
- inherit git-r3
- PROPERTIES="live"
- SRC_URI=""
- KEYWORDS="";;
-0.8.0_alpha1)
- my_PV=${PV/_alpha/-alpha}-pre-redrawhook
- SRC_URI="https://github.com/zsh-users/${PN}/archive/${my_PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${my_PV}";;
-*beta*)
- EGIT_COMMIT="02a37dd919dc48e0821186e5f20e78bd0215f86a"
- SRC_URI="https://github.com/zsh-users/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
-*)
- SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz";;
-esac
-
-DESCRIPTION="Fish shell like syntax highlighting for zsh"
-HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting/"
-
-LICENSE="HPND"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-shells/zsh"
-DEPEND=""
-
-MAKE_ARGS=(
- "SHARE_DIR=${ED}/usr/share/zsh/site-contrib/${PN}"
- "DOC_DIR=${ED}/usr/share/doc/${PF}"
-)
-
-src_prepare() {
- grep -q 'local .*cdpath_dir' \
- "${S}/highlighters/main/main-highlighter.zsh" >/dev/null 2>&1 || \
- sed -i -e '/for cdpath_dir/ilocal cdpath_dir' \
- -- "${S}/highlighters/main/main-highlighter.zsh" || die
- default
-}
-
-src_compile() {
- emake "${MAKE_ARGS[@]}"
-}
-
-src_install() {
- local DISABLE_AUTOFORMATTING DOC_CONTENTS
- emake "${MAKE_ARGS[@]}" install
- DISABLE_AUTOFORMATTING="true"
- DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
-. /usr/share/zsh/site-contrib/${PN}/zsh-syntax-highlighting.zsh
-at the end of your ~/.zshrc
-For testing, you can also execute the above command in your zsh."
- readme.gentoo_create_doc
-}
-
-src_test() {
- emake "${MAKE_ARGS[@]}" test
- emake "${MAKE_ARGS[@]}" perf
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild
index 5257efa9..be2a231c 100644
--- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild
@@ -1,31 +1,26 @@
-# Copyright 2011-2018 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
-inherit readme.gentoo-r1
+inherit eutils readme.gentoo
-RESTRICT="mirror"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
case ${PV} in
99999999*)
- EGIT_REPO_URI="https://github.com/zsh-users/${PN}.git"
+ EGIT_REPO_URI="git://github.com/zsh-users/${PN}.git"
inherit git-r3
PROPERTIES="live"
SRC_URI=""
KEYWORDS="";;
-0.8.0_alpha1)
- SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV/_alpha/-alpha}-pre-redrawhook.tar.gz -> ${P}.tar.gz";;
-*beta*)
- EGIT_COMMIT="02a37dd919dc48e0821186e5f20e78bd0215f86a"
- SRC_URI="https://github.com/zsh-users/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
*)
- SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz";;
+ RESTRICT="mirror"
+ SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86";;
esac
DESCRIPTION="Fish shell like syntax highlighting for zsh"
-HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting/"
+HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting"
LICENSE="HPND"
SLOT="0"
@@ -34,39 +29,24 @@ IUSE=""
RDEPEND="app-shells/zsh"
DEPEND=""
-MAKE_ARGS=(
- "SHARE_DIR=${ED}/usr/share/zsh/site-contrib/${PN}"
- "DOC_DIR=${ED}/usr/share/doc/${PF}"
-)
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
+. /usr/share/zsh/site-contrib/${PN}/zsh-syntax-highlighting.zsh
+at the end of your ~/.zshrc
+For testing, you can also execute the above command in your zsh."
src_prepare() {
grep -q 'local .*cdpath_dir' \
"${S}/highlighters/main/main-highlighter.zsh" >/dev/null 2>&1 || \
sed -i -e '/for cdpath_dir/ilocal cdpath_dir' \
-- "${S}/highlighters/main/main-highlighter.zsh" || die
- default
-}
-
-src_compile() {
- emake "${MAKE_ARGS[@]}"
+ epatch_user
}
src_install() {
- local DISABLE_AUTOFORMATTING DOC_CONTENTS
- emake "${MAKE_ARGS[@]}" install
- DISABLE_AUTOFORMATTING="true"
- DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
-. /usr/share/zsh/site-contrib/${PN}/zsh-syntax-highlighting.zsh
-at the end of your ~/.zshrc
-For testing, you can also execute the above command in your zsh."
+ dodoc *.md
+ insinto /usr/share/zsh/site-contrib/${PN}
+ doins *.zsh
+ doins -r highlighters
readme.gentoo_create_doc
}
-
-src_test() {
- emake "${MAKE_ARGS[@]}" test
- emake "${MAKE_ARGS[@]}" perf
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
new file mode 100644
index 00000000..1f1e1300
--- /dev/null
+++ b/app-shells/zsh/ChangeLog
@@ -0,0 +1,136 @@
+# ChangeLog for app-shells/zsh
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*zsh-5.1.1-r1 (02 Oct 2015)
+
+ 02 Oct 2015; Martin Väth <martin@mvath.de>:
+ Fix some problems with gcc-5, gentoo see bug 547950
+
+*zsh-5.1.1 (20 Sep 2015)
+
+ 20 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zsh-5.0.8 (26 Jun 2015)
+
+ 26 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Update some changes from gentoo repository
+
+*zsh-5.0.7-r3 (30 Apr 2015)
+
+ 30 Apr 2015; Martin Väth <martin@mvath.de>:
+ Add patch to fix compilation with gcc-5. Remove old ebuilds
+
+*zsh-5.0.7-r2 (02 Jan 2015)
+
+ 02 Jan 2015; Martin Väth <martin@mvath.de>:
+ Add zsh-5.0.7-pid-ns.patch from gentoo repository
+
+*zsh-5.0.7-r1 (09 Oct 2014)
+
+ 09 Oct 2014; Martin Väth <martin@mvath.de>:
+ Add fix-cvs-completion.patch from gentoo repository
+
+*zsh-5.0.7 (08 Oct 2014)
+
+ 08 Oct 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zsh-5.0.6 (29 Aug 2014)
+
+ 29 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+ Update KEYWORDS and some trivial changes from gentoo repository
+
+*zsh-5.0.5 (09 Jan 2014)
+
+ 24 Jan 2014; Martin Väth <martin@mvath.de>:
+ Avoid duplicate installation
+
+ 09 Jan 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zsh-5.0.4 (20 Dec 2013)
+
+ 20 Dec 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zsh-5.0.3 (15 Dec 2013)
+
+ 15 Dec 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Remove now unnecessary support for
+ generating helpfiles. Keep USE-flags in the live version to keep deps
+ optional. Support IUSE=doc properly also for live version
+
+*zsh-99999999 (29 May 2013)
+
+ 16 Nov 2013; Martin Väth <martin@mvath.de>:
+ Remove necessity for USE=custom-ctype
+
+ 13 Nov 2013; Martin Väth <martin@mvath.de>:
+ Fix HELPDIR path. Revision bump to force change. Do not use-enable compile.
+ I submitted help installation upstream; this is used unconditionally if
+ available (currently only in the live ebuild)
+
+ 12 Nov 2013; Martin Väth <martin@mvath.de>:
+ Live version: Fix paths, remove IUSE=doc.
+ Do not install _run-help without USE=run-help
+
+ 08 Nov 2013; Martin Väth <martin@mvath.de>:
+ add IUSE=compile (suggestion of bug 362812)
+
+ 12 Oct 2013; Martin Väth <martin@mvath.de>:
+ Use readme.gentoo.eclass
+
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Bump to git-r3.eclass
+
+ 11 Aug 2013; Martin Väth <martin@mvath.de>:
+ app-doc/yodl -> app-text/yodl which is in gentoo tree meanwhile
+
+ 29 May 2013; Martin Väth <martin@mvath.de>:
+ Add live ebuild. Requires app-doc/yodl which is not in the gentoo tree;
+ get it e.g. from the betagarden or roslin overlay
+
+*zsh-5.0.2-r3 (29 May 2013)
+
+ 29 May 2013; Martin Väth <martin@mvath.de>:
+ Use upstream patches for texinfo-5 and fix-parameter-modifier crash,
+ as in the main gentoo tree. Print messages conditionally as far as possible
+
+*zsh-5.0.2-r2 (15 Apr 2013)
+
+ 29 Apr 2013; Martin Väth <martin@mvath.de>:
+ Honour EPREFIX. Remove redundant link of binary before installing
+
+ 15 Apr 2013; Martin Väth <martin@mvath.de>:
+ Override LC_CTYPE, using some heuristics, unless USE=custom-ctype is chosen
+
+*zsh-5.0.2-r2 (03 Apr 2013)
+
+ 03 Apr 2013; Martin Väth <martin@mvath.de>:
+ Fix compilation with texinfo-5
+
+*zsh-5.0.2-r1 (13 Jan 2013)
+
+ 13 Jan 2013; Martin Väth <martin@mvath.de>:
+ Fix run-help generation by forcing width 80. Install run-help completion
+
+*zsh-5.0.2 (25 Dec 2012)
+
+ 25 Dec 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zsh-5.0.0 (13 Aug 2012)
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 14 Aug 2012; Martin Väth <martin@mvath.de>:
+ Add comments about the paranoid pipe testing
+
+ 13 Aug 2012; Martin Väth <martin@mvath.de>:
+ Copy from the portage tree to add support for run-help and for removal of
+ unrequested completion functions (in particular, do not put them in $fpath).
+ Clear previous ChangeLog
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
new file mode 100644
index 00000000..74a49796
--- /dev/null
+++ b/app-shells/zsh/Manifest
@@ -0,0 +1,2 @@
+DIST zsh-5.1.1-doc.tar.xz 3061616 SHA256 f5944f29ec77100afdc3634f0bb8ffc4328a2d03147f23d1aa6280b6aa7d622f SHA512 868444662ca9b1cc91f2ecff56ce0944e5e75fc5f5a349eb538ca23a8eb8fb4ebaa8efc2ba1d8581424f25b0009305ed7a6f08ca06db1ecde467eeb5d6b71621 WHIRLPOOL c72760d754e19e7fe1f501bd395becc13877d4b0ba20fbf1f08855be5affb78aac07e2c14e779c1b554e21e29d8bfd5203dd41da5d3f21020dac7033510a4662
+DIST zsh-5.1.1.tar.xz 2788676 SHA256 74e9453b5470b3c0970f9f93cfd603d241c3d7b1968adc0e4b3951073e8d3dec SHA512 732f183a03125e83da11a38c638ca54a667326a23ca19418b0df27b1d5b3b1f360383d84f66bde064911effaa2ce9cbb9b6ab86deddb92f80e8f601af8a82b3e WHIRLPOOL 55199e45557c2667e8f9b7564af44b32b610fe09db451493bd64642c2987e12a638b2b96d6530a16427ba17a6ca8c20e73f88013cf47996eea24e5e1595691e7
diff --git a/app-shells/zsh/files/prompt_gentoo_setup-1 b/app-shells/zsh/files/prompt_gentoo_setup-1
new file mode 100644
index 00000000..046e2d87
--- /dev/null
+++ b/app-shells/zsh/files/prompt_gentoo_setup-1
@@ -0,0 +1,33 @@
+# gentoo prompt theme
+
+prompt_gentoo_help () {
+ cat <<'EOF'
+This prompt is color-scheme-able. You can invoke it thus:
+
+ prompt gentoo [<promptcolor> [<usercolor> [<rootcolor>]]]
+
+EOF
+}
+
+prompt_gentoo_setup () {
+ local prompt_gentoo_prompt=${1:-'blue'}
+ local prompt_gentoo_user=${2:-'green'}
+ local prompt_gentoo_root=${3:-'red'}
+
+ if [ "$USER" = 'root' ]
+ then
+ local base_prompt="%B%F{$prompt_gentoo_root}%m%k "
+ else
+ local base_prompt="%B%F{$prompt_gentoo_user}%n@%m%k "
+ fi
+ local post_prompt="%b%f%k"
+
+ #setopt noxtrace localoptions
+
+ local path_prompt="%B%F{$prompt_gentoo_prompt}%1~"
+ typeset -g PS1="$base_prompt$path_prompt %# $post_prompt"
+ typeset -g PS2="$base_prompt$path_prompt %_> $post_prompt"
+ typeset -g PS3="$base_prompt$path_prompt ?# $post_prompt"
+}
+
+prompt_gentoo_setup "$@"
diff --git a/app-shells/zsh/files/zprofile-1 b/app-shells/zsh/files/zprofile-1
new file mode 100644
index 00000000..0602c9c5
--- /dev/null
+++ b/app-shells/zsh/files/zprofile-1
@@ -0,0 +1,43 @@
+# @GENTOO_PORTAGE_EPREFIX@/etc/zsh/zprofile
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/files/zprofile-1,v 1.1 2010/08/15 12:21:56 tove Exp $
+
+# Load environment settings from profile.env, which is created by
+# env-update from the files in /etc/env.d
+if [ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env ] ; then
+ . "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env
+fi
+
+# You should override these in your ~/.zprofile (or equivalent) for per-user
+# settings. For system defaults, you can add a new file in /etc/profile.d/.
+export EDITOR=${EDITOR:-/bin/nano}
+export PAGER=${PAGER:-/usr/bin/less}
+
+# 077 would be more secure, but 022 is generally quite realistic
+umask 022
+
+# Set up PATH depending on whether we're root or a normal user.
+# There's no real reason to exclude sbin paths from the normal user,
+# but it can make tab-completion easier when they aren't in the
+# user's PATH to pollute the executable namespace.
+#
+# It is intentional in the following line to use || instead of -o.
+# This way the evaluation can be short-circuited and calling whoami is
+# avoided.
+if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
+ @ZSH_NOPREFIX@PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
+ @ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}:/usr/sbin:/usr/bin:/sbin:/bin"
+else
+ @ZSH_NOPREFIX@PATH="/usr/local/bin:/usr/bin:/bin:${PATH}"
+ @ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}:/usr/bin:/bin"
+fi
+export PATH
+unset ROOTPATH
+
+shopts=$-
+setopt nullglob
+for sh in "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.d/*.sh ; do
+ [ -r "$sh" ] && . "$sh"
+done
+unsetopt nullglob
+set -$shopts
+unset sh shopts
diff --git a/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch b/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch
new file mode 100644
index 00000000..74756d29
--- /dev/null
+++ b/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/547950
+http://www.zsh.org/mla/workers/2015/msg02660.html
+
+fix building w/gcc-5
+
+--- a/Src/Modules/system.mdd
++++ b/Src/Modules/system.mdd
+@@ -15,7 +15,7 @@
+ touch errtmp.out; \
+ else \
+ $(AWK) -f $(sdir)/errnames1.awk @ERRNO_H@ >errtmp.c; \
+- $(CPP) errtmp.c >errtmp.out; \
++ $(CPP) -P errtmp.c >errtmp.out; \
+ fi
+ $(AWK) -f $(sdir)/errnames2.awk errtmp.out > $@
+ rm -f errtmp.c errtmp.out
diff --git a/app-shells/zsh/files/zsh-init.d-gentoo-r1.diff b/app-shells/zsh/files/zsh-init.d-gentoo-r1.diff
new file mode 100644
index 00000000..9597a733
--- /dev/null
+++ b/app-shells/zsh/files/zsh-init.d-gentoo-r1.diff
@@ -0,0 +1,30 @@
+--- zsh-4.3.11/Completion/Unix/Command/_init_d
++++ zsh-4.3.11/Completion/Unix/Command/_init_d
+@@ -1,6 +1,6 @@
+ #compdef -p */(init|rc[0-9S]#).d/*
+
+-local cmds script
++local cmds script opts
+
+ _compskip=all
+
+@@ -83,10 +83,17 @@
+
+ script=$words[1]
+ [[ $script = */* ]] || script="$(_init_d_fullpath "$script")"
++[[ ! -f $script ]] &&
++ { _message "${words[1]:t} is not an init script" && return }
+
+ cmds=( $(_init_d_get_cmds) ) || return
+
+-(( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds ||
+- cmds=(start stop)
++(( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds
++opts=(start stop restart pause zap status ineed iuse needsme usesme broken)
++
++# If we didn't get $cmds from a zstyle, then read init script for opts.
++# If script doesn't specify opts, then default to the standard opts.
++(( $#cmds )) || cmds=( ${(eQz)${(M)${(f)"$( <$script)"}:#[[:blank:]]#opts=*}#*=} )
++(( $#cmds )) || cmds=($opts)
+
+ _sub_commands $cmds
diff --git a/app-shells/zsh/metadata.xml b/app-shells/zsh/metadata.xml
new file mode 100644
index 00000000..14b074fe
--- /dev/null
+++ b/app-shells/zsh/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>tove@gentoo.org</email>
+ <name>Torsten Veller</name>
+ <description>Interim maintainer</description>
+</maintainer>
+<maintainer>
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ <description>Co-maintainer</description>
+</maintainer>
+<maintainer>
+ <email>martin@mvath.de</email>
+ <name>Martin Väth</name>
+ <description>Maintainer of run-help, compile, and completion_* USE-flags</description>
+</maintainer>
+<longdescription>
+ Zsh is a shell designed for interactive use, although it is also a
+ powerful scripting language. Many of the useful features of bash, ksh,
+ and tcsh were incorporated into zsh; many original features were
+ added.
+</longdescription>
+<use>
+ <flag name="compile">Byte-compile. This costs disk space and may make things faster or slower. Do not use this if you are cross-compiling</flag>
+ <flag name='completion_AIX'>Install zsh completions for AIX</flag>
+ <flag name='completion_BSD'>Install zsh completions for BSD</flag>
+ <flag name='completion_Cygwin'>Install zsh completions for Cygwin</flag>
+ <flag name='completion_Darwin'>Install zsh completions for Darwin</flag>
+ <flag name='completion_Debian'>Install zsh completions for Debian</flag>
+ <flag name='completion_Linux'>Install zsh completions for Linux</flag>
+ <flag name='completion_Mandriva'>Install zsh completions for Mandriva</flag>
+ <flag name='completion_openSUSE'>Install zsh completions for openSUSE</flag>
+ <flag name='completion_Redhat'>Install zsh completions for Redhat</flag>
+ <flag name='completion_Solaris'>Install zsh completions for Solaris</flag>
+ <flag name='completion_Unix'>Install zsh completions for Unix</flag>
+ <flag name='completion_X'>Install zsh completions for X</flag>
+</use>
+</pkgmetadata>
diff --git a/app-shells/zsh/zsh-5.1.1-r1.ebuild b/app-shells/zsh/zsh-5.1.1-r1.ebuild
new file mode 100644
index 00000000..d5a8bc8e
--- /dev/null
+++ b/app-shells/zsh/zsh-5.1.1-r1.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib prefix readme.gentoo
+
+MY_PV=${PV/_p/-dev-}
+S=${WORKDIR}/${PN}-${MY_PV}
+
+zsh_ftp="http://www.zsh.org/pub"
+
+ZSH_URI="${zsh_ftp}/${PN}-${MY_PV}.tar.xz"
+ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.xz"
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+case ${PV} in
+9999*)
+ SRC_URI=""
+ EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
+ inherit git-r3
+ WANT_LIBTOOL="none"
+ inherit autotools
+ KEYWORDS=""
+# Creating help files needs util-linux for colcrt.
+# Please let me know if you have an arch where "colcrt" (or at least "col")
+# is provided by a different package.
+ DEPEND="app-text/yodl
+ dev-lang/perl
+ sys-apps/man
+ sys-apps/util-linux
+ doc? (
+ sys-apps/texinfo
+ app-text/texi2html
+ virtual/latex-base
+ )"
+ PROPERTIES="live"
+ LIVE=:;;
+*)
+ SRC_URI="${ZSH_URI}
+ doc? ( ${ZSH_DOC_URI} )"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ #KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ DEPEND=""
+ LIVE=false;;
+esac
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+IUSE="caps compile"
+COMPLETIONS="AIX BSD Cygwin Darwin Debian +Linux Mandriva openSUSE Redhat Solaris +Unix +X"
+for curr in ${COMPLETIONS}
+do case ${curr} in
+ [+-]*)
+ IUSE+=" ${curr%%[!+-]*}completion_${curr#?}"
+ continue;;
+ esac
+ IUSE+=" completion_${curr}"
+done
+IUSE+=" debug doc examples gdbm maildir pcre static unicode"
+
+RDEPEND="
+ >=sys-libs/ncurses-5.1:0
+ static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
+ caps? ( sys-libs/libcap )
+ pcre? (
+ >=dev-libs/libpcre-3.9
+ static? ( >=dev-libs/libpcre-3.9[static-libs] )
+ )
+ gdbm? ( sys-libs/gdbm )
+"
+DEPEND+="
+ sys-apps/groff
+ ${RDEPEND}"
+PDEPEND="
+ examples? ( app-doc/zsh-lovers )
+"
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="
+If you want to enable Portage completions and Gentoo prompt,
+emerge app-shells/zsh-completion and add
+ autoload -U compinit promptinit
+ compinit
+ promptinit; prompt gentoo
+to your ~/.zshrc
+
+Also, if you want to enable cache for the completions, add
+ zstyle ':completion::complete:*' use-cache 1
+to your ~/.zshrc
+
+If you want to use run-help add to your ~/.zshrc
+ unalias run-help
+ autoload -Uz run-help
+
+Note that a system zprofile startup file is installed. This will override
+PATH and possibly other variables that a user may set in ~/.zshenv.
+Custom PATH settings and similar overridden variables can be moved
+to ~/.zprofile or other user startup files that are sourced after the
+system zprofile.
+
+If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,
+one method is to use a separate path-setting file that is conditionally sourced
+in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the
+zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/.
+
+See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation.
+"
+
+src_prepare() {
+ # fix zshall problem with soelim
+ ln -s Doc man1 || die
+ mv Doc/zshall.1 Doc/zshall.1.soelim || die
+ soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
+
+ epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
+ epatch "${FILESDIR}"/${PN}-5.1.0-gcc-5.patch #547950
+
+ cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
+ eprefixify "${T}"/zprofile || die
+ if use prefix ; then
+ sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
+ else
+ sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
+ fi
+ set --
+ file='Src/Zle/complete.mdd'
+ for i in ${COMPLETIONS}
+ do case ${i} in
+ [+-]*)
+ i=${i#?};;
+ esac
+ grep -q "Completion\/${i}" -- "${S}/${file}" \
+ || die "${file} does not contain Completion/${i}"
+ use completion_${i} || set -- "${@}" -e "s/Completion\/${i}[^ ']*//"
+ done
+ [ ${#} -eq 0 ] || sed -i "${@}" -- "${S}/${file}" \
+ || die "patching ${file} failed"
+ epatch_user
+ ! ${LIVE} || eautoreconf
+ PVPATH=$(. "${S}"/Config/version.mk && printf '%s' "${VERSION}") && \
+ [ -n "${PVPATH}" ] || PVPATH=${PV}
+}
+
+src_configure() {
+ local myconf
+ myconf=()
+
+ if use static ; then
+ myconf+=( --disable-dynamic )
+ append-ldflags -static
+ fi
+ if use debug ; then
+ myconf+=(
+ --enable-zsh-debug
+ --enable-zsh-mem-debug
+ --enable-zsh-mem-warning
+ --enable-zsh-secure-free
+ --enable-zsh-hash-debug
+ )
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ myconf+=( --enable-libs=-liconv )
+ append-ldflags -Wl,-x
+ fi
+
+ econf \
+ --bindir="${EPREFIX}"/bin \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --enable-etcdir="${EPREFIX}"/etc/zsh \
+ --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PVPATH}/help \
+ --enable-fndir="${EPREFIX}"/usr/share/zsh/${PVPATH}/functions \
+ --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
+ --enable-function-subdirs \
+ --with-tcsetpgrp \
+ $(use_enable maildir maildir-support) \
+ $(use_enable pcre) \
+ $(use_enable caps cap) \
+ $(use_enable unicode multibyte) \
+ $(use_enable gdbm ) \
+ "${myconf[@]}"
+
+ if use static ; then
+ # compile all modules statically, see Bug #27392
+ # removed cap and curses because linking failes
+ sed -e "s,link=no,link=static,g" \
+ -e "/^name=zsh\/cap/s,link=static,link=no," \
+ -e "/^name=zsh\/curses/s,link=static,link=no," \
+ -i "${S}"/config.modules || die
+ if ! use gdbm ; then
+ sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
+ "${S}"/config.modules || die
+ fi
+ fi
+}
+
+src_compile() {
+ default
+ ! ${LIVE} || ! use doc || emake -C Doc everything
+}
+
+src_test() {
+ addpredict /dev/ptmx
+ local i
+ for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
+ rm "${S}"/Test/${i} || die
+ done
+ emake check
+}
+
+zcompile_dirs() {
+ use compile || return 0
+ einfo "compiling modules"
+ local i
+ i="${S}/Src/zshpaths.h"
+ test -f "${i}" || die "cannot find ${i}"
+ # We need this directory also in pkg_postinst
+ FPATH_DIR="$(sed -n -e \
+ 's/^#define FPATH_DIR .*\"\(.*\)\".*$/\1/p' -- "${i}" 2>/dev/null)" \
+ || FPATH_DIR=
+ [ -n "${FPATH_DIR}" ] || die "cannot parse ${i}"
+ pushd -- "${ED}" >/dev/null || die
+ test -d ".${FPATH_DIR}" || die "parsing ${i} gave strange result ${FPATH_DIR}"
+ find ".${FPATH_DIR}" -type d -exec "${ED}bin/zsh" -fc 'setopt nullglob
+for i
+do a=(${i}/*(.))
+ [[ ${#a} -eq 0 ]] && continue
+ echo "Compiling ${i#.}.zwc"
+ zcompile -U -M ${i}.zwc ${a} || exit
+done' zsh '{}' '+' || die 'compiling failed. If you are cross-compiling set USE=-compile'
+ popd >/dev/null
+}
+
+touch_zwc() {
+ use compile || return 0
+ einfo "touching *.zwc files"
+ # Make a sanity check that variables are preserved after zcompile_dirs:
+ # If the package mangler is not faulty, this *must* succeeed.
+ [ -n "${FPATH_DIR}" ] && test -d "${FPATH_DIR}" || die "strange FPATH_DIR"
+ # Now the actual action
+ find "${EPREFIX}${FPATH_DIR}" -type f -name '*.zwc' \
+ -exec "$(command -v touch)" -- '{}' '+'
+}
+
+src_install() {
+ emake DESTDIR="${ED}" install install.info
+
+ insinto /etc/zsh
+ doins "${T}"/zprofile
+
+ keepdir /usr/share/zsh/site-functions
+ insinto /usr/share/zsh/"${PVPATH}"/functions/Prompts
+ newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
+
+ local i
+
+ # install miscellaneous scripts (bug #54520)
+ sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
+ -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
+ -i "${S}"/{Util,Misc}/* || die
+ for i in Util Misc ; do
+ insinto /usr/share/zsh/"${PVPATH}"/${i}
+ doins ${i}/*
+ done
+
+ # install header files (bug #538684)
+ insinto /usr/include/zsh
+ doins config.h Src/*.epro
+ for i in Src/{zsh.mdh,*.h} ; do
+ sed -e 's@\.\./config\.h@config.h@' \
+ -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
+ -i "${i}"
+ doins "${i}"
+ done
+
+ dodoc ChangeLog* META-FAQ NEWS README config.modules
+ readme.gentoo_create_doc
+
+ if use doc ; then
+ pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+ dohtml -r Doc/*
+ insinto /usr/share/doc/${PF}
+ doins Doc/zsh.{dvi,pdf}
+ popd >/dev/null
+ fi
+
+ docinto StartupFiles
+ dodoc StartupFiles/z*
+
+ zcompile_dirs
+
+ rm -vf -- "${ED}"/bin/zsh?*
+}
+
+pkg_postinst() {
+ readme.gentoo_pkg_postinst
+ touch_zwc
+}
diff --git a/app-shells/zsh/zsh-99999999.ebuild b/app-shells/zsh/zsh-99999999.ebuild
new file mode 100644
index 00000000..d5a8bc8e
--- /dev/null
+++ b/app-shells/zsh/zsh-99999999.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib prefix readme.gentoo
+
+MY_PV=${PV/_p/-dev-}
+S=${WORKDIR}/${PN}-${MY_PV}
+
+zsh_ftp="http://www.zsh.org/pub"
+
+ZSH_URI="${zsh_ftp}/${PN}-${MY_PV}.tar.xz"
+ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.xz"
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+case ${PV} in
+9999*)
+ SRC_URI=""
+ EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
+ inherit git-r3
+ WANT_LIBTOOL="none"
+ inherit autotools
+ KEYWORDS=""
+# Creating help files needs util-linux for colcrt.
+# Please let me know if you have an arch where "colcrt" (or at least "col")
+# is provided by a different package.
+ DEPEND="app-text/yodl
+ dev-lang/perl
+ sys-apps/man
+ sys-apps/util-linux
+ doc? (
+ sys-apps/texinfo
+ app-text/texi2html
+ virtual/latex-base
+ )"
+ PROPERTIES="live"
+ LIVE=:;;
+*)
+ SRC_URI="${ZSH_URI}
+ doc? ( ${ZSH_DOC_URI} )"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ #KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ DEPEND=""
+ LIVE=false;;
+esac
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+IUSE="caps compile"
+COMPLETIONS="AIX BSD Cygwin Darwin Debian +Linux Mandriva openSUSE Redhat Solaris +Unix +X"
+for curr in ${COMPLETIONS}
+do case ${curr} in
+ [+-]*)
+ IUSE+=" ${curr%%[!+-]*}completion_${curr#?}"
+ continue;;
+ esac
+ IUSE+=" completion_${curr}"
+done
+IUSE+=" debug doc examples gdbm maildir pcre static unicode"
+
+RDEPEND="
+ >=sys-libs/ncurses-5.1:0
+ static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
+ caps? ( sys-libs/libcap )
+ pcre? (
+ >=dev-libs/libpcre-3.9
+ static? ( >=dev-libs/libpcre-3.9[static-libs] )
+ )
+ gdbm? ( sys-libs/gdbm )
+"
+DEPEND+="
+ sys-apps/groff
+ ${RDEPEND}"
+PDEPEND="
+ examples? ( app-doc/zsh-lovers )
+"
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="
+If you want to enable Portage completions and Gentoo prompt,
+emerge app-shells/zsh-completion and add
+ autoload -U compinit promptinit
+ compinit
+ promptinit; prompt gentoo
+to your ~/.zshrc
+
+Also, if you want to enable cache for the completions, add
+ zstyle ':completion::complete:*' use-cache 1
+to your ~/.zshrc
+
+If you want to use run-help add to your ~/.zshrc
+ unalias run-help
+ autoload -Uz run-help
+
+Note that a system zprofile startup file is installed. This will override
+PATH and possibly other variables that a user may set in ~/.zshenv.
+Custom PATH settings and similar overridden variables can be moved
+to ~/.zprofile or other user startup files that are sourced after the
+system zprofile.
+
+If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,
+one method is to use a separate path-setting file that is conditionally sourced
+in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the
+zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/.
+
+See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation.
+"
+
+src_prepare() {
+ # fix zshall problem with soelim
+ ln -s Doc man1 || die
+ mv Doc/zshall.1 Doc/zshall.1.soelim || die
+ soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
+
+ epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
+ epatch "${FILESDIR}"/${PN}-5.1.0-gcc-5.patch #547950
+
+ cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
+ eprefixify "${T}"/zprofile || die
+ if use prefix ; then
+ sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
+ else
+ sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
+ fi
+ set --
+ file='Src/Zle/complete.mdd'
+ for i in ${COMPLETIONS}
+ do case ${i} in
+ [+-]*)
+ i=${i#?};;
+ esac
+ grep -q "Completion\/${i}" -- "${S}/${file}" \
+ || die "${file} does not contain Completion/${i}"
+ use completion_${i} || set -- "${@}" -e "s/Completion\/${i}[^ ']*//"
+ done
+ [ ${#} -eq 0 ] || sed -i "${@}" -- "${S}/${file}" \
+ || die "patching ${file} failed"
+ epatch_user
+ ! ${LIVE} || eautoreconf
+ PVPATH=$(. "${S}"/Config/version.mk && printf '%s' "${VERSION}") && \
+ [ -n "${PVPATH}" ] || PVPATH=${PV}
+}
+
+src_configure() {
+ local myconf
+ myconf=()
+
+ if use static ; then
+ myconf+=( --disable-dynamic )
+ append-ldflags -static
+ fi
+ if use debug ; then
+ myconf+=(
+ --enable-zsh-debug
+ --enable-zsh-mem-debug
+ --enable-zsh-mem-warning
+ --enable-zsh-secure-free
+ --enable-zsh-hash-debug
+ )
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ myconf+=( --enable-libs=-liconv )
+ append-ldflags -Wl,-x
+ fi
+
+ econf \
+ --bindir="${EPREFIX}"/bin \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --enable-etcdir="${EPREFIX}"/etc/zsh \
+ --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PVPATH}/help \
+ --enable-fndir="${EPREFIX}"/usr/share/zsh/${PVPATH}/functions \
+ --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
+ --enable-function-subdirs \
+ --with-tcsetpgrp \
+ $(use_enable maildir maildir-support) \
+ $(use_enable pcre) \
+ $(use_enable caps cap) \
+ $(use_enable unicode multibyte) \
+ $(use_enable gdbm ) \
+ "${myconf[@]}"
+
+ if use static ; then
+ # compile all modules statically, see Bug #27392
+ # removed cap and curses because linking failes
+ sed -e "s,link=no,link=static,g" \
+ -e "/^name=zsh\/cap/s,link=static,link=no," \
+ -e "/^name=zsh\/curses/s,link=static,link=no," \
+ -i "${S}"/config.modules || die
+ if ! use gdbm ; then
+ sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
+ "${S}"/config.modules || die
+ fi
+ fi
+}
+
+src_compile() {
+ default
+ ! ${LIVE} || ! use doc || emake -C Doc everything
+}
+
+src_test() {
+ addpredict /dev/ptmx
+ local i
+ for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
+ rm "${S}"/Test/${i} || die
+ done
+ emake check
+}
+
+zcompile_dirs() {
+ use compile || return 0
+ einfo "compiling modules"
+ local i
+ i="${S}/Src/zshpaths.h"
+ test -f "${i}" || die "cannot find ${i}"
+ # We need this directory also in pkg_postinst
+ FPATH_DIR="$(sed -n -e \
+ 's/^#define FPATH_DIR .*\"\(.*\)\".*$/\1/p' -- "${i}" 2>/dev/null)" \
+ || FPATH_DIR=
+ [ -n "${FPATH_DIR}" ] || die "cannot parse ${i}"
+ pushd -- "${ED}" >/dev/null || die
+ test -d ".${FPATH_DIR}" || die "parsing ${i} gave strange result ${FPATH_DIR}"
+ find ".${FPATH_DIR}" -type d -exec "${ED}bin/zsh" -fc 'setopt nullglob
+for i
+do a=(${i}/*(.))
+ [[ ${#a} -eq 0 ]] && continue
+ echo "Compiling ${i#.}.zwc"
+ zcompile -U -M ${i}.zwc ${a} || exit
+done' zsh '{}' '+' || die 'compiling failed. If you are cross-compiling set USE=-compile'
+ popd >/dev/null
+}
+
+touch_zwc() {
+ use compile || return 0
+ einfo "touching *.zwc files"
+ # Make a sanity check that variables are preserved after zcompile_dirs:
+ # If the package mangler is not faulty, this *must* succeeed.
+ [ -n "${FPATH_DIR}" ] && test -d "${FPATH_DIR}" || die "strange FPATH_DIR"
+ # Now the actual action
+ find "${EPREFIX}${FPATH_DIR}" -type f -name '*.zwc' \
+ -exec "$(command -v touch)" -- '{}' '+'
+}
+
+src_install() {
+ emake DESTDIR="${ED}" install install.info
+
+ insinto /etc/zsh
+ doins "${T}"/zprofile
+
+ keepdir /usr/share/zsh/site-functions
+ insinto /usr/share/zsh/"${PVPATH}"/functions/Prompts
+ newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
+
+ local i
+
+ # install miscellaneous scripts (bug #54520)
+ sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
+ -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
+ -i "${S}"/{Util,Misc}/* || die
+ for i in Util Misc ; do
+ insinto /usr/share/zsh/"${PVPATH}"/${i}
+ doins ${i}/*
+ done
+
+ # install header files (bug #538684)
+ insinto /usr/include/zsh
+ doins config.h Src/*.epro
+ for i in Src/{zsh.mdh,*.h} ; do
+ sed -e 's@\.\./config\.h@config.h@' \
+ -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
+ -i "${i}"
+ doins "${i}"
+ done
+
+ dodoc ChangeLog* META-FAQ NEWS README config.modules
+ readme.gentoo_create_doc
+
+ if use doc ; then
+ pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+ dohtml -r Doc/*
+ insinto /usr/share/doc/${PF}
+ doins Doc/zsh.{dvi,pdf}
+ popd >/dev/null
+ fi
+
+ docinto StartupFiles
+ dodoc StartupFiles/z*
+
+ zcompile_dirs
+
+ rm -vf -- "${ED}"/bin/zsh?*
+}
+
+pkg_postinst() {
+ readme.gentoo_pkg_postinst
+ touch_zwc
+}
diff --git a/app-shells/zshrc-mv/ChangeLog b/app-shells/zshrc-mv/ChangeLog
new file mode 100644
index 00000000..b3e538d5
--- /dev/null
+++ b/app-shells/zshrc-mv/ChangeLog
@@ -0,0 +1,149 @@
+# ChangeLog for app-shells/zshrc-mv
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*zshrc-2.22 (05 Sep 2015)
+
+ 05 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.21 (24 Jul 2015)
+
+ 24 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Play nice with set -u. Support after_zshrc
+
+*zshrc-2.18 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.17 (03 May 2015)
+
+ 12 Apr 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.16 (12 Apr 2015)
+
+ 12 Apr 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.15 (10 Oct 2014)
+
+ 10 Oct 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.14 (24 May 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 24 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.13 (19 May 2014)
+
+ 19 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.12 (25 Apr 2014)
+
+ 25 Apr 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.11 (15 Mar 2014)
+
+ 15 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support ebook extensions
+
+*zshrc-2.10 (18 Dec 2013)
+
+ 15 Mar 2014; Martin Väth <martin@mvath.de>:
+ Use optfeature
+
+ 18 Dec 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.9 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.8 (12 Nov 2013)
+
+ 12 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.7 (31 Aug 2013)
+
+ 31 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.6 (09 Aug 2013)
+
+ 09 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.5 (04 Aug 2013)
+
+ 04 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.4 (09 Jun 2013)
+
+ 09 Jun 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.3 (19 May 2013)
+
+ 19 May 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.2 (09 Apr 2013)
+
+ 09 Apr 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.1 (07 Apr 2013)
+
+ 07 Apr 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-2.0 (23 Mar 2013)
+
+ 23 Mar 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support solarized if SOLARIZED is set
+
+*zshrc-1.7 (21 Feb 2013)
+
+ 21 Feb 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-1.6 (26 Jan 2013)
+
+ 26 Jan 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-1.5 (24 Jan 2013)
+
+ 24 Jan 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-1.4 (19 Jan 2013)
+
+ 19 Jan 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-1.3 (14 Jan 2013)
+
+ 14 Jan 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-1.2 (12 Jan 2013)
+
+ 12 Jan 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zshrc-1.1 (06 Jan 2013)
+
+ 06 Jan 2013; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/app-shells/zshrc-mv/Manifest b/app-shells/zshrc-mv/Manifest
index 83e7cefa..fc7f4b24 100644
--- a/app-shells/zshrc-mv/Manifest
+++ b/app-shells/zshrc-mv/Manifest
@@ -1 +1 @@
-DIST zshrc-mv-6.6.tar.gz 13273 SHA512 1a35413002ea2c85d6ce90ac03d74ef6bca9a87160dadc1726a7af56d4cecd5cf21dac862c584cabd44bb704b117cb71cdb4d008e6d4715a37659ec2779c2bf5
+DIST zshrc-mv-2.22.tar.gz 9335 SHA256 b8239c42abc7ba7cca92b7f21da137f082c722002027473deb24881300353f84 SHA512 5da027365d77f61735031c9a1d298b4d01131921c2b4fab8f7d9777a775a124c203446f3f1d7872c04f6da58e9d474b9b777a2940250b336f89fa103c72640b3 WHIRLPOOL d0bef8dce9b5219a461d056e9bf20b1c2842a8ad173db6b49bb960102d5d945814de3799b6376650335218d1f969130b538f37e9e7cead9ca4deec33f17ac904
diff --git a/app-shells/zshrc-mv/metadata.xml b/app-shells/zshrc-mv/metadata.xml
index 15f686e3..079e97cc 100644
--- a/app-shells/zshrc-mv/metadata.xml
+++ b/app-shells/zshrc-mv/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-shells/zshrc-mv/zshrc-mv-2.22.ebuild b/app-shells/zshrc-mv/zshrc-mv-2.22.ebuild
new file mode 100644
index 00000000..6f08fdd9
--- /dev/null
+++ b/app-shells/zshrc-mv/zshrc-mv-2.22.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils
+
+DESCRIPTION="A zshrc file initializing zsh specific interactive features"
+HOMEPAGE="https://github.com/vaeth/zshrc-mv/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="!app-shells/auto-fu-zsh[kill-line(-)]"
+
+src_prepare() {
+ epatch_user
+}
+
+src_install() {
+ dodoc README
+ insinto /etc/zsh
+ doins zshrc
+}
+
+pkg_postinst() {
+ optfeature "automagic completion" '>=app-shells/auto-fu-zsh-0.0.1.13'
+ optfeature "syntax highlighting" 'app-shells/zsh-syntax-highlighting'
+ optfeature "a nice prompt" 'app-shells/set_prompt'
+ optfeature "nice directory colors" 'app-shells/termcolors-mv'
+}
diff --git a/app-shells/zshrc-mv/zshrc-mv-6.6.ebuild b/app-shells/zshrc-mv/zshrc-mv-6.6.ebuild
deleted file mode 100644
index ed9b5e56..00000000
--- a/app-shells/zshrc-mv/zshrc-mv-6.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2013-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="A zshrc file initializing zsh specific interactive features"
-HOMEPAGE="https://github.com/vaeth/zshrc-mv/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-4.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# These should really depend on USE-flags but must not by policy.
-# Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283
-OPTIONAL_RDEPEND=">=app-shells/auto-fu-zsh-0.0.1.12_p0
->=app-shells/set_prompt-3.0.0
-app-shells/termcolors-mv
-app-shells/zsh-autosuggestions
-|| ( app-shells/fast-syntax-highlighting app-shells/zsh-syntax-highlighting )"
-
-RDEPEND="!app-shells/auto-fu-zsh[kill-line(-)]
- ${OPTIONAL_RDEPEND}"
-
-src_install() {
- dodoc README.md
- insinto /etc/zsh
- doins zshrc
-}
diff --git a/app-text/ispell/Manifest b/app-text/ispell/Manifest
deleted file mode 100644
index 46b01419..00000000
--- a/app-text/ispell/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ispell-3.4.00.tar.gz 638770 SHA512 790475e7e296554221679b59856f256889a7193ab39e7314174f92364eaf4b658cc7e6b4f4b7892fa8f3cf0c022d933fc0c995c5e414987cbdcde27723e3da31
diff --git a/app-text/ispell/ispell-3.4.00-r1.ebuild b/app-text/ispell/ispell-3.4.00-r1.ebuild
deleted file mode 100644
index 4e9bcae0..00000000
--- a/app-text/ispell/ispell-3.4.00-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-inherit toolchain-funcs
-
-DESCRIPTION="fast screen-oriented spelling checker"
-HOMEPAGE="http://fmg-www.cs.ucla.edu/geoff/ispell.html"
-SRC_URI="http://fmg-www.cs.ucla.edu/geoff/tars/${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0/3.4.00"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+tinfo"
-
-RDEPEND="
- sys-apps/miscfiles
- sys-libs/ncurses:0=[tinfo=]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- local tinfo
- if use tinfo ; then
- tinfo='s:\(^#define TERMLIB\).*:\1 "-ltinfo":'
- else
- tinfo=
- fi
- sed -i \
- -e 's:\(^#define CC\).*:\1 "'"$(tc-getCC)"'":' \
- -e 's:\(^#define CFLAGS\).*:\1 "'"${CFLAGS}"'":' \
- ${tinfo:+-e "${tinfo}"} \
- -- "${S}"/config.X || die
- sed -i \
- -e 's:/usr/local/man:'"${EPREFIX}"'/usr/share/man:' \
- -e 's:/usr/local/lib:'"${EPREFIX}"'/usr/'"$(get_libdir)/${PN}:" \
- -e 's:/usr/local:'"${EPREFIX}"'/usr:' \
- -- "${S}"/local.h.* || die
- default
-}
-
-src_configure() {
- # Prepare config.sh for installation phase to avoid twice rebuild
- emake -j1 config.sh
- sed \
- -e "s:^\(BINDIR='\)${EPREFIX}\(/usr.*\):\1${ED}\2:" \
- -e "s:^\(LIBDIR='\)${EPREFIX}\(/usr.*\):\1${ED}\2:" \
- -e "s:^\(MAN1DIR='\)${EPREFIX}\(/usr.*\):\1${ED}\2:" \
- -e "s:^\(MAN45DIR='\)${EPREFIX}\(/usr.*\):\1${ED}\2:" \
- < config.sh > config.sh.install
-}
-
-src_compile() {
- emake -j1
-}
-
-src_install() {
- mv config.sh.install config.sh
- emake -j1 install
- dodoc CHANGES Contributors README WISHES
-}
diff --git a/app-text/ispell/metadata.xml b/app-text/ispell/metadata.xml
deleted file mode 100644
index c389fb06..00000000
--- a/app-text/ispell/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <use>
- <flag name="tinfo">Whether to support (and require) sys-libs/ncurses[tinfo].</flag>
- </use>
-</pkgmetadata>
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
deleted file mode 100644
index aedeacca..00000000
--- a/app-text/lesspipe/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lesspipe-1.85.tar.gz 120568 SHA512 420d087b9fc9783b9404855e4656b88c10852502bd2f1931978b7dc7ff15eba1a375b217184480f9b341322c12e7336d0861ba9c2f673f2b2a7fb340a381f5b2
diff --git a/app-text/lesspipe/lesspipe-1.85.ebuild b/app-text/lesspipe/lesspipe-1.85.ebuild
deleted file mode 100644
index c50e199b..00000000
--- a/app-text/lesspipe/lesspipe-1.85.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wolfgang Friebel's preprocessor for sys-apps/less. Disable by appending colon"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-case ${PV} in
-9999*)
- EGIT_REPO_URI="https://github.com/wofr06/${PN}.git"
- #EGIT_BRANCH="master"
- EGIT_BRANCH="lesspipe"
- inherit git-r3
- SRC_URI=""
- KEYWORDS="";;
-*alpha*)
- RESTRICT="mirror"
- EGIT_COMMIT="45bec232114c0dbfba2284f1ec594eccc80db49c"
- SRC_URI="https://github.com/vaeth/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
-esac
-inherit required-use-warn
-pkg_pretend() {
- required-use-warn
-}
-
-IUSE="antiword brotli cabextract catdoc +cpio +djvu dpkg +dvi2tty +elinks exiftool fastjar +ghostscript gpg +groff hdf5 +html2text id3v2 image isoinfo libplist libreoffice +links +lynx lz4 lzip mediainfo mp3info mp3info2 netcdf ooffice p7zip pandoc pdf pstotext rar rpm +rpm2targz unrar unrtf +unzip +w3m wv xlhtml zstd"
-
-htmlmode="( || ( html2text links lynx elinks w3m ) )"
-REQUIRED_USE="!rpm2targz? ( rpm? ( cpio ) )
- ooffice? ${htmlmode}
- xlhtml? ${htmlmode}"
-REQUIRED_USE_WARN="
- alpha? ( !brotli !catdoc !exiftool !fastjar !id3v2 !libplist !libreoffice
- !mediainfo !mp3info !mp3info2 !netcdf !ooffice !pandoc !pstotext
- !rar !zstd )
- arm? ( !antiword !brotli !catdoc !exiftool !fastjar !html2text !id3v2
- !mediainfo !mp3info !ooffice !pandoc !pstotext !rar !xlhtml )
- arm64? ( !antiword !catdoc !dpkg !elinks !exiftool !fastjar !html2text
- !id3v2 !mediainfo !mp3info !mp3info2 !netcdf !ooffice !pandoc !pstotext
- !rar !unrtf !wv !xlhtml )
- hppa? ( !catdoc !brotli !exiftool !fastjar !hdf5 !libplist !libreoffice
- !mediainfo !mp3info2 !netcdf !ooffice !pandoc !rar !w3m !xlhtml !zstd )
- ia64? ( !antiword !brotli !catdoc !exiftool !fastjar !id3v2 !libplist
- !libreoffice !mp3info !mp3info2 !mediainfo !netcdf !ooffice
- !pandoc !pstotext !rar !xlhtml !zstd )
- ppc? ( !brotli !libreoffice !mediainfo !pandoc )
- ppc64? ( !brotli !catdoc !fastjar !mediainfo !ooffice !pandoc !xlhtml )
- sparc? ( !brotli !catdoc !exiftool !fastjar !id3v2 !libplist !libreoffice
- !mediainfo !mp3info2 !netcdf !ooffice !pandoc !pstotext !zstd )"
-
-BOTH_DEPEND="sys-apps/file
- app-arch/xz-utils
- app-arch/bzip2
- dev-lang/perl
- brotli? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc? ( !ppc64? ( !sparc?
- ( >=app-arch/brotli-1 ) ) ) ) ) ) ) )
- lz4? ( app-arch/lz4 )
- zstd? ( !alpha? ( !hppa? ( !ia64? ( !sparc? ( app-arch/zstd ) ) ) ) )
- unzip? ( app-arch/unzip )
- fastjar? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64? ( !ppc64? (
- !sparc? ( app-arch/fastjar ) ) ) ) ) ) ) )
- unrar? ( app-arch/unrar )
- !unrar? (
- rar? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64?
- ( app-text/o3read ) ) ) ) ) ) )
- lzip? ( app-arch/lzip )
- p7zip? ( app-arch/p7zip )
- cpio? ( app-arch/cpio )
- cabextract? ( app-arch/cabextract )
- exiftool? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !sparc?
- ( media-libs/exiftool ) ) ) ) ) )
- html2text? ( !arm? ( !arm64? ( app-text/html2text ) ) )
- !html2text? (
- links? ( www-client/links )
- !links? (
- lynx? ( www-client/lynx )
- !lynx? (
- elinks? ( !arm64? ( www-client/elinks ) )
- !elinks? (
- w3m? ( !hppa? ( www-client/w3m ) ) ) ) ) )
- groff? ( sys-apps/groff )
- rpm2targz? ( app-arch/rpm2targz )
- !rpm2targz? ( rpm? ( app-arch/rpm ) )
- antiword? ( !arm? ( !arm64? ( !ia64? ( app-text/antiword ) ) ) )
- !antiword? (
- catdoc? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64?
- ( !ppc64? ( !sparc? ( app-text/catdoc ) ) ) ) ) ) ) ) )
- xlhtml? ( !arm? ( !arm64? ( !hppa? ( !ia64? ( !ppc64?
- ( app-text/xlhtml ) ) ) ) ) )
- unrtf? ( !arm64? ( app-text/unrtf ) )
- ooffice? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64? (
- !ppc64? ( !sparc? ( app-text/o3read ) ) ) ) ) ) ) )
- pandoc? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64? ( !ppc? ( !ppc64? (
- !sparc? ( app-text/pandoc ) ) ) ) ) ) ) ) )
- libreoffice? ( !alpha? ( !hppa? ( !ia64? ( !ppc? ( !sparc?
- ( app-office/libreoffice ) ) ) ) ) )
- djvu? ( app-text/djvu )
- dvi2tty? ( app-text/texlive )
- pstotext? ( !alpha? ( !arm? ( !arm64? ( !ia64? ( !sparc?
- ( app-text/pstotext ) ) ) ) ) )
- !pstotext? ( ghostscript? ( app-text/ghostscript-gpl ) )
- gpg? ( app-crypt/gnupg )
- pdf? ( app-text/poppler )
- id3v2? ( !alpha? ( !arm? ( !arm64? ( !ia64? ( !sparc?
- ( media-sound/id3v2 ) ) ) ) ) )
- !id3v2? (
- mp3info2? ( !alpha? ( !arm64? ( !hppa? ( !ia64? ( !sparc?
- ( dev-perl/MP3-Tag ) ) ) ) ) )
- !mp3info2? (
- mp3info? ( !alpha? ( !arm? ( !arm64? ( !ia64?
- ( media-sound/mp3info ) ) ) ) ) ) )
- image? ( virtual/imagemagick-tools )
- isoinfo? ( || ( virtual/cdrtools app-cdr/dvd+rw-tools ) )
- libplist? ( !alpha? ( !hppa? ( !ia64? ( !sparc?
- ( app-pda/libplist ) ) ) ) )
- dpkg? ( !arm64? ( app-arch/dpkg ) )
- hdf5? ( !hppa? ( sci-libs/hdf5 ) )
- netcdf? ( !alpha? ( !arm64? ( !hppa? ( !ia64? ( !sparc?
- ( sci-libs/netcdf ) ) ) ) ) )
- wv? ( !arm64? ( app-text/wv ) )
- mediainfo? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64? ( !ppc? (
- !ppc64? ( !sparc? ( media-video/mediainfo ) ) ) ) ) ) ) ) )"
-DEPEND="${BOTH_DEPEND}"
-RDEPEND="${BOTH_DEPEND}
- sys-apps/less
- !<sys-apps/less-483-r1"
-
-ModifyStart() {
- sedline=
-}
-
-Modify() {
- if [ -z "${sedline:++}" ]
- then sedline='/^__END__$/,${'
- else sedline=${sedline}';'
- fi
- sedline=${sedline}'s/^\('${1}'[[:space:]][[:space:]]*\)[nNyY]/\1'${2:-Y}'/'
-}
-
-ModifyEnd() {
- sedline=${sedline}'}'
- sed -i -e "${sedline}" "${S}/configure" || die
-}
-
-ModifyY() {
- local i
- for i
- do Modify "${i}"
- done
-}
-
-ModifyN() {
- local i
- for i
- do Modify "${i}" N
- done
-}
-
-ModifyX() {
- if [ ${?} -eq 0 ]
- then ModifyY "${@}"
- else ModifyN "${@}"
- fi
-}
-
-ModifyU() {
- local i
- for i
- do use "${i}"; ModifyX "${i}"
- done
-}
-
-Modify1() {
- local i search
- search=:
- for i
- do ${search} && use "${i}" && search=false; ModifyX "${i}"
- done
-}
-
-src_prepare() {
- printf 'h5dump\t\tN\nncdump\t\tN\n' >>"${S}/configure"
- ModifyStart
- ModifyY 'HILITE'
- ModifyY 'LESS_ADVANCED_PREPROCESSOR'
- ModifyY 'nm'
- ModifyY 'iconv'
- ModifyY 'bzip2'
- ModifyY 'xz' 'lzma'
- ModifyY 'perldoc'
- ModifyU 'unzip' 'fastjar'
- Modify1 'unrar' 'rar'
- ModifyU 'brotli'
- ModifyU 'lz4'
- ModifyU 'lzip'
- ModifyU 'zstd'
- use p7zip; ModifyX '7za'
- ModifyU 'cpio' 'cabextract' 'groff'
- Modify1 'html2text' 'links' 'lynx' 'elinks' 'w3m'
- use rpm2targz; ModifyX 'rpmunpack'
- ! use rpm2targz && use rpm; ModifyX 'rpm' 'rpm2cpio'
- Modify1 'antiword' 'catdoc'
- use xlhtml; ModifyX 'ppthtml' 'xlhtml'
- ModifyU 'unrtf'
- use ooffice; ModifyX 'o3tohtml'
- use djvu; ModifyX 'djvutxt'
- ModifyU 'dvi2tty'
- ModifyU 'pstotext'
- ! use pstotext && use ghostscript; ModifyX 'ps2ascii'
- ModifyU 'gpg'
- use pdf; ModifyX 'pdftohtml' 'pdftotext' 'pdfinfo'
- Modify1 'id3v2' 'mp3info2' 'mp3info'
- use image; ModifyX 'identify'
- ModifyU 'isoinfo'
- ModifyU 'libreoffice'
- ModifyU 'pandoc'
- use wv; ModifyX 'wvText'
- Modify1 'exiftool' 'mediainfo'
- ModifyN 'dpkg'
- ModifyN 'lsbom'
- use libplist; ModifyX 'plutil'
- use hdf5; ModifyX 'h5dump'
- use netcdf; ModifyX 'ncdump'
- ModifyEnd
- printf '%s\n' 'LESS_ADVANCED_PREPROCESSOR=1' >70lesspipe || die
- default
-}
-
-src_configure() {
- ./configure --fixed --prefix="${EPREFIX}"/usr || die
-}
-
-src_compile() {
- :
-}
-
-src_install() {
- doenvd 70lesspipe
- dodir /usr/share/man/man1
- default
-}
diff --git a/app-text/lesspipe/lesspipe-99999999.ebuild b/app-text/lesspipe/lesspipe-99999999.ebuild
deleted file mode 100644
index c50e199b..00000000
--- a/app-text/lesspipe/lesspipe-99999999.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wolfgang Friebel's preprocessor for sys-apps/less. Disable by appending colon"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-case ${PV} in
-9999*)
- EGIT_REPO_URI="https://github.com/wofr06/${PN}.git"
- #EGIT_BRANCH="master"
- EGIT_BRANCH="lesspipe"
- inherit git-r3
- SRC_URI=""
- KEYWORDS="";;
-*alpha*)
- RESTRICT="mirror"
- EGIT_COMMIT="45bec232114c0dbfba2284f1ec594eccc80db49c"
- SRC_URI="https://github.com/vaeth/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
-esac
-inherit required-use-warn
-pkg_pretend() {
- required-use-warn
-}
-
-IUSE="antiword brotli cabextract catdoc +cpio +djvu dpkg +dvi2tty +elinks exiftool fastjar +ghostscript gpg +groff hdf5 +html2text id3v2 image isoinfo libplist libreoffice +links +lynx lz4 lzip mediainfo mp3info mp3info2 netcdf ooffice p7zip pandoc pdf pstotext rar rpm +rpm2targz unrar unrtf +unzip +w3m wv xlhtml zstd"
-
-htmlmode="( || ( html2text links lynx elinks w3m ) )"
-REQUIRED_USE="!rpm2targz? ( rpm? ( cpio ) )
- ooffice? ${htmlmode}
- xlhtml? ${htmlmode}"
-REQUIRED_USE_WARN="
- alpha? ( !brotli !catdoc !exiftool !fastjar !id3v2 !libplist !libreoffice
- !mediainfo !mp3info !mp3info2 !netcdf !ooffice !pandoc !pstotext
- !rar !zstd )
- arm? ( !antiword !brotli !catdoc !exiftool !fastjar !html2text !id3v2
- !mediainfo !mp3info !ooffice !pandoc !pstotext !rar !xlhtml )
- arm64? ( !antiword !catdoc !dpkg !elinks !exiftool !fastjar !html2text
- !id3v2 !mediainfo !mp3info !mp3info2 !netcdf !ooffice !pandoc !pstotext
- !rar !unrtf !wv !xlhtml )
- hppa? ( !catdoc !brotli !exiftool !fastjar !hdf5 !libplist !libreoffice
- !mediainfo !mp3info2 !netcdf !ooffice !pandoc !rar !w3m !xlhtml !zstd )
- ia64? ( !antiword !brotli !catdoc !exiftool !fastjar !id3v2 !libplist
- !libreoffice !mp3info !mp3info2 !mediainfo !netcdf !ooffice
- !pandoc !pstotext !rar !xlhtml !zstd )
- ppc? ( !brotli !libreoffice !mediainfo !pandoc )
- ppc64? ( !brotli !catdoc !fastjar !mediainfo !ooffice !pandoc !xlhtml )
- sparc? ( !brotli !catdoc !exiftool !fastjar !id3v2 !libplist !libreoffice
- !mediainfo !mp3info2 !netcdf !ooffice !pandoc !pstotext !zstd )"
-
-BOTH_DEPEND="sys-apps/file
- app-arch/xz-utils
- app-arch/bzip2
- dev-lang/perl
- brotli? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc? ( !ppc64? ( !sparc?
- ( >=app-arch/brotli-1 ) ) ) ) ) ) ) )
- lz4? ( app-arch/lz4 )
- zstd? ( !alpha? ( !hppa? ( !ia64? ( !sparc? ( app-arch/zstd ) ) ) ) )
- unzip? ( app-arch/unzip )
- fastjar? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64? ( !ppc64? (
- !sparc? ( app-arch/fastjar ) ) ) ) ) ) ) )
- unrar? ( app-arch/unrar )
- !unrar? (
- rar? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64?
- ( app-text/o3read ) ) ) ) ) ) )
- lzip? ( app-arch/lzip )
- p7zip? ( app-arch/p7zip )
- cpio? ( app-arch/cpio )
- cabextract? ( app-arch/cabextract )
- exiftool? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !sparc?
- ( media-libs/exiftool ) ) ) ) ) )
- html2text? ( !arm? ( !arm64? ( app-text/html2text ) ) )
- !html2text? (
- links? ( www-client/links )
- !links? (
- lynx? ( www-client/lynx )
- !lynx? (
- elinks? ( !arm64? ( www-client/elinks ) )
- !elinks? (
- w3m? ( !hppa? ( www-client/w3m ) ) ) ) ) )
- groff? ( sys-apps/groff )
- rpm2targz? ( app-arch/rpm2targz )
- !rpm2targz? ( rpm? ( app-arch/rpm ) )
- antiword? ( !arm? ( !arm64? ( !ia64? ( app-text/antiword ) ) ) )
- !antiword? (
- catdoc? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64?
- ( !ppc64? ( !sparc? ( app-text/catdoc ) ) ) ) ) ) ) ) )
- xlhtml? ( !arm? ( !arm64? ( !hppa? ( !ia64? ( !ppc64?
- ( app-text/xlhtml ) ) ) ) ) )
- unrtf? ( !arm64? ( app-text/unrtf ) )
- ooffice? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64? (
- !ppc64? ( !sparc? ( app-text/o3read ) ) ) ) ) ) ) )
- pandoc? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64? ( !ppc? ( !ppc64? (
- !sparc? ( app-text/pandoc ) ) ) ) ) ) ) ) )
- libreoffice? ( !alpha? ( !hppa? ( !ia64? ( !ppc? ( !sparc?
- ( app-office/libreoffice ) ) ) ) ) )
- djvu? ( app-text/djvu )
- dvi2tty? ( app-text/texlive )
- pstotext? ( !alpha? ( !arm? ( !arm64? ( !ia64? ( !sparc?
- ( app-text/pstotext ) ) ) ) ) )
- !pstotext? ( ghostscript? ( app-text/ghostscript-gpl ) )
- gpg? ( app-crypt/gnupg )
- pdf? ( app-text/poppler )
- id3v2? ( !alpha? ( !arm? ( !arm64? ( !ia64? ( !sparc?
- ( media-sound/id3v2 ) ) ) ) ) )
- !id3v2? (
- mp3info2? ( !alpha? ( !arm64? ( !hppa? ( !ia64? ( !sparc?
- ( dev-perl/MP3-Tag ) ) ) ) ) )
- !mp3info2? (
- mp3info? ( !alpha? ( !arm? ( !arm64? ( !ia64?
- ( media-sound/mp3info ) ) ) ) ) ) )
- image? ( virtual/imagemagick-tools )
- isoinfo? ( || ( virtual/cdrtools app-cdr/dvd+rw-tools ) )
- libplist? ( !alpha? ( !hppa? ( !ia64? ( !sparc?
- ( app-pda/libplist ) ) ) ) )
- dpkg? ( !arm64? ( app-arch/dpkg ) )
- hdf5? ( !hppa? ( sci-libs/hdf5 ) )
- netcdf? ( !alpha? ( !arm64? ( !hppa? ( !ia64? ( !sparc?
- ( sci-libs/netcdf ) ) ) ) ) )
- wv? ( !arm64? ( app-text/wv ) )
- mediainfo? ( !alpha? ( !arm? ( !arm64? ( !hppa? ( !ia64? ( !ppc? (
- !ppc64? ( !sparc? ( media-video/mediainfo ) ) ) ) ) ) ) ) )"
-DEPEND="${BOTH_DEPEND}"
-RDEPEND="${BOTH_DEPEND}
- sys-apps/less
- !<sys-apps/less-483-r1"
-
-ModifyStart() {
- sedline=
-}
-
-Modify() {
- if [ -z "${sedline:++}" ]
- then sedline='/^__END__$/,${'
- else sedline=${sedline}';'
- fi
- sedline=${sedline}'s/^\('${1}'[[:space:]][[:space:]]*\)[nNyY]/\1'${2:-Y}'/'
-}
-
-ModifyEnd() {
- sedline=${sedline}'}'
- sed -i -e "${sedline}" "${S}/configure" || die
-}
-
-ModifyY() {
- local i
- for i
- do Modify "${i}"
- done
-}
-
-ModifyN() {
- local i
- for i
- do Modify "${i}" N
- done
-}
-
-ModifyX() {
- if [ ${?} -eq 0 ]
- then ModifyY "${@}"
- else ModifyN "${@}"
- fi
-}
-
-ModifyU() {
- local i
- for i
- do use "${i}"; ModifyX "${i}"
- done
-}
-
-Modify1() {
- local i search
- search=:
- for i
- do ${search} && use "${i}" && search=false; ModifyX "${i}"
- done
-}
-
-src_prepare() {
- printf 'h5dump\t\tN\nncdump\t\tN\n' >>"${S}/configure"
- ModifyStart
- ModifyY 'HILITE'
- ModifyY 'LESS_ADVANCED_PREPROCESSOR'
- ModifyY 'nm'
- ModifyY 'iconv'
- ModifyY 'bzip2'
- ModifyY 'xz' 'lzma'
- ModifyY 'perldoc'
- ModifyU 'unzip' 'fastjar'
- Modify1 'unrar' 'rar'
- ModifyU 'brotli'
- ModifyU 'lz4'
- ModifyU 'lzip'
- ModifyU 'zstd'
- use p7zip; ModifyX '7za'
- ModifyU 'cpio' 'cabextract' 'groff'
- Modify1 'html2text' 'links' 'lynx' 'elinks' 'w3m'
- use rpm2targz; ModifyX 'rpmunpack'
- ! use rpm2targz && use rpm; ModifyX 'rpm' 'rpm2cpio'
- Modify1 'antiword' 'catdoc'
- use xlhtml; ModifyX 'ppthtml' 'xlhtml'
- ModifyU 'unrtf'
- use ooffice; ModifyX 'o3tohtml'
- use djvu; ModifyX 'djvutxt'
- ModifyU 'dvi2tty'
- ModifyU 'pstotext'
- ! use pstotext && use ghostscript; ModifyX 'ps2ascii'
- ModifyU 'gpg'
- use pdf; ModifyX 'pdftohtml' 'pdftotext' 'pdfinfo'
- Modify1 'id3v2' 'mp3info2' 'mp3info'
- use image; ModifyX 'identify'
- ModifyU 'isoinfo'
- ModifyU 'libreoffice'
- ModifyU 'pandoc'
- use wv; ModifyX 'wvText'
- Modify1 'exiftool' 'mediainfo'
- ModifyN 'dpkg'
- ModifyN 'lsbom'
- use libplist; ModifyX 'plutil'
- use hdf5; ModifyX 'h5dump'
- use netcdf; ModifyX 'ncdump'
- ModifyEnd
- printf '%s\n' 'LESS_ADVANCED_PREPROCESSOR=1' >70lesspipe || die
- default
-}
-
-src_configure() {
- ./configure --fixed --prefix="${EPREFIX}"/usr || die
-}
-
-src_compile() {
- :
-}
-
-src_install() {
- doenvd 70lesspipe
- dodir /usr/share/man/man1
- default
-}
diff --git a/app-text/mbtpdfasm/Manifest b/app-text/mbtpdfasm/Manifest
deleted file mode 100644
index 0b12594e..00000000
--- a/app-text/mbtpdfasm/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mbtPdfAsm-1.0.28.tar.gz 253032 SHA512 78cd744e1ffbf7db1b3fb27d8edf369382ff0e9c48634b85f13734561dceef1a22bae7e001ad01567e924d41465bb03f16480f3e588b060bcd5e2c50b14dc016
-DIST mbtpdfasm-1.0.28-manual.pdf.bz2 6581 SHA512 cc9660427cfe33c3b070b31676d94d8ac64940a5625c7441cb1401d09e828be077fa7d67d0496fa71ef1c50a077c8882a89f63f76f8531cae00aff5edf6e1fa2
diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff
deleted file mode 100644
index bd63327f..00000000
--- a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- pdfFile.hpp.orig 2007-07-26 16:32:50.000000000 +0200
-+++ pdfFile.hpp 2007-10-05 22:40:50.000000000 +0200
-@@ -161,7 +161,7 @@
-
- //int findInheritRes(C_pdfFile *org, char *fBuf, int lg, char **pcRes);
- int makeRes(C_pdfFile *org, char *fBuf, int lg, char **pcRes);
-- int makeAttrib(C_pdfFile *org, char *fBuf, int lgOrgBuf, char **pcRes, char *add, int lgAdd);
-+ int makeAttrib(C_pdfFile *org, char *fBuf, int lgOrgBuf, char **pcRes, int add, int lgAdd);
-
- bool fast; // version rapide, on ne gre pas les options
- bool closed; //protection plus rien n'est possible aprs l'appel la fonction close
---- pdfFile.cpp.orig 2007-08-22 20:44:31.000000000 +0200
-+++ pdfFile.cpp 2007-10-05 22:42:39.000000000 +0200
-@@ -934,7 +934,7 @@
- /* ********************************************** */
- #pragma warning(disable : 4100)
-
--int C_pdfFile::makeAttrib(C_pdfFile *org, char *buf, int lgOrgBuf, char **pcRes, char *add, int lgAdd) {
-+int C_pdfFile::makeAttrib(C_pdfFile *org, char *buf, int lgOrgBuf, char **pcRes, int add, int lgAdd) {
- char *pc;
- int lgRes, lgBuf, j, nObj, r;
-
-@@ -973,12 +973,12 @@
- }
-
- if ( (lgAdd != 0) && (add != 0) ) {
-- switch ( (int)add ) {
-+ switch ( add ) {
- case _Resources:
-
- break;
- default:
-- memcpy(pc + lgRes, add + sizeof(int), lgAdd);
-+ memcpy(pc + lgRes, (char *)add + sizeof(int), lgAdd);
- lgRes += lgAdd;
- }
- }
diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff
deleted file mode 100644
index 99b109d5..00000000
--- a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- main.cpp.orig 2007-07-30 15:25:27.000000000 +0200
-+++ main.cpp 2007-10-05 22:49:29.000000000 +0200
-@@ -52,7 +52,7 @@
- char tc[1000];
- int i;
-
-- fprintf(output, "mbtPdfAsm %s\r\nusing PCRE 4.4 (http://www.pcre.org)\r\nsee at %s", strVersion, strMPAURL);
-+ fprintf(output, "mbtPdfAsm %s\r\nusing PCRE 4.4 (http://www.pcre.org)\r\nsee at %s\n", strVersion, strMPAURL);
-
- return 0;
- }
diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff
deleted file mode 100644
index 278a3c03..00000000
--- a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff
+++ /dev/null
@@ -1,101 +0,0 @@
---- makefile.orig 2007-07-26 19:33:54.000000000 +0200
-+++ makefile 2007-10-05 22:54:31.000000000 +0200
-@@ -10,66 +10,66 @@
- ZLIB = $(O)/adler32.o $(O)/compress.o $(O)/crc32.o $(O)/deflate.o $(O)/gzio.o $(O)/infback.o $(O)/inffast.o $(O)/inflate.o $(O)/inftrees.o $(O)/trees.o $(O)/uncompr.o $(O)/zutil.o
- #
- $(EXENAME): $(LF) $(ZLIB)
-- $(CC) $(LF) $(ZLIB) -o $@
-+ $(CC) $(LDFLAGS) $(LF) $(ZLIB) -o $@
- $(O)/main.o: main.cpp
-- $(CC) -c main.cpp -o $*.o
-+ $(CC) $(CXXFLAGS) -c main.cpp -o $*.o
- $(O)/pdfFile.o: pdfFile.cpp
-- $(CC) -c pdfFile.cpp -o $*.o
-+ $(CC) $(CXXFLAGS) -c pdfFile.cpp -o $*.o
- $(O)/pdfObject.o: pdfObject.cpp
-- $(CC) -c pdfObject.cpp -o $*.o
-+ $(CC) $(CXXFLAGS) -c pdfObject.cpp -o $*.o
- $(O)/pdfEncrypt.o: pdfEncrypt.cpp
-- $(CC) -c pdfEncrypt.cpp -o $*.o
-+ $(CC) $(CXXFLAGS) -c pdfEncrypt.cpp -o $*.o
- $(O)/pdfNames.o: pdfNames.cpp
-- $(CC) -c pdfNames.cpp -o $*.o
-+ $(CC) $(CXXFLAGS) -c pdfNames.cpp -o $*.o
- $(O)/pdfFileOutline.o: pdfFileOutline.cpp
-- $(CC) -c pdfFileOutline.cpp -o $*.o
-+ $(CC) $(CXXFLAGS) -c pdfFileOutline.cpp -o $*.o
- $(O)/pdfXrefTable.o: pdfXrefTable.cpp
-- $(CC) -c pdfXrefTable.cpp -o $*.o
-+ $(CC) $(CXXFLAGS) -c pdfXrefTable.cpp -o $*.o
- $(O)/string.o: string.cpp
-- $(CC) -c string.cpp -o $*.o
-+ $(CC) $(CXXFLAGS) -c string.cpp -o $*.o
- $(O)/pdfString.o: pdfString.cpp
-- $(CC) -c pdfString.cpp -o $*.o
-+ $(CC) $(CXXFLAGS) -c pdfString.cpp -o $*.o
- $(O)/rc4.o: rc4.cpp
-- $(CC) -c rc4.cpp -o $*.o
-+ $(CC) $(CXXFLAGS) -c rc4.cpp -o $*.o
- $(O)/md5.o: md5.c
-- $(CC) -c md5.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c md5.c -o $*.o
- $(O)/listeFichiers_linux.o: listeFichiers_linux.cpp
-- $(CC) -c listeFichiers_linux.cpp -o $*.o
-+ $(CC) $(CXXFLAGS) -c listeFichiers_linux.cpp -o $*.o
- $(O)/diversPdf.o: diversPdf.cpp
-- $(CC) -c diversPdf.cpp -o $*.o
-+ $(CC) $(CXXFLAGS) -c diversPdf.cpp -o $*.o
- $(O)/strMatcher.o: strMatcher.cpp
-- $(CC) -c strMatcher.cpp -o $*.o
-+ $(CC) $(CXXFLAGS) -c strMatcher.cpp -o $*.o
- $(O)/pcre.o: pcre.c
-- $(CC) -c pcre.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c pcre.c -o $*.o
- $(O)/study.o: study.c
-- $(CC) -c study.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c study.c -o $*.o
- $(O)/get.o: get.c
-- $(CC) -c get.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c get.c -o $*.o
- $(O)/maketables.o: maketables.c
-- $(CC) -c maketables.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c maketables.c -o $*.o
- $(O)/calc.o: calc.cpp
-- $(CC) -c calc.cpp -o $*.o
-+ $(CC) $(CXXFLAGS) -c calc.cpp -o $*.o
- $(O)/adler32.o: adler32.c zlib.h zconf.h
-- $(CC) -c adler32.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c adler32.c -o $*.o
- $(O)/compress.o: compress.c zlib.h zconf.h
-- $(CC) -c compress.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c compress.c -o $*.o
- $(O)/crc32.o: crc32.c zlib.h zconf.h crc32.h
-- $(CC) -c crc32.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c crc32.c -o $*.o
- $(O)/deflate.o: deflate.c deflate.h zutil.h zlib.h zconf.h
-- $(CC) -c deflate.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c deflate.c -o $*.o
- $(O)/gzio.o: gzio.c zutil.h zlib.h zconf.h
-- $(CC) -c gzio.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c gzio.c -o $*.o
- $(O)/infback.o: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
-- $(CC) -c infback.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c infback.c -o $*.o
- $(O)/inffast.o: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-- $(CC) -c inffast.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c inffast.c -o $*.o
- $(O)/inflate.o: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
-- $(CC) -c inflate.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c inflate.c -o $*.o
- $(O)/inftrees.o: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-- $(CC) -c inftrees.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c inftrees.c -o $*.o
- $(O)/trees.o: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-- $(CC) -c trees.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c trees.c -o $*.o
- $(O)/uncompr.o: uncompr.c zlib.h zconf.h
-- $(CC) -c uncompr.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c uncompr.c -o $*.o
- $(O)/zutil.o: zutil.c zutil.h zlib.h zconf.h
-- $(CC) -c zutil.c -o $*.o
-+ $(CC) $(CXXFLAGS) -c zutil.c -o $*.o
diff --git a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff
deleted file mode 100644
index 02446ae6..00000000
--- a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur work.orig/makefile work/makefile
---- work.orig/makefile 2010-07-21 01:11:54.390456452 +0200
-+++ work/makefile 2010-07-21 01:12:22.843456093 +0200
-@@ -9,8 +9,8 @@
- LF = $(O)/main.o $(O)/pdfFile.o $(O)/pdfXrefTable.o $(O)/string.o $(O)/rc4.o $(O)/md5.o $(O)/pdfString.o $(O)/listeFichiers_linux.o $(O)/diversPdf.o $(O)/strMatcher.o $(O)/pcre.o $(O)/study.o $(O)/get.o $(O)/maketables.o $(O)/pdfEncrypt.o $(O)/pdfFileOutline.o $(O)/pdfNames.o $(O)/pdfObject.o $(O)/calc.o
- ZLIB = $(O)/adler32.o $(O)/compress.o $(O)/crc32.o $(O)/deflate.o $(O)/gzio.o $(O)/infback.o $(O)/inffast.o $(O)/inflate.o $(O)/inftrees.o $(O)/trees.o $(O)/uncompr.o $(O)/zutil.o
- #
--$(EXENAME): $(LF) $(ZLIB)
-- $(CC) $(LDFLAGS) $(LF) $(ZLIB) -o $@
-+$(EXENAME): $(LF)
-+ $(CC) $(LDFLAGS) $(LF) -lz -o $@
- $(O)/main.o: main.cpp
- $(CC) $(CXXFLAGS) -c main.cpp -o $*.o
- $(O)/pdfFile.o: pdfFile.cpp
-diff -Naur work.orig/pdfObject.cpp work/pdfObject.cpp
---- work.orig/pdfObject.cpp 2007-08-22 20:13:56.000000000 +0200
-+++ work/pdfObject.cpp 2010-07-21 01:11:54.486455713 +0200
-@@ -1,7 +1,7 @@
- #include "pdfObject.hpp"
- #include "pdfXrefTable.hpp"
- #include "diversPdf.hpp"
--#include "zlib.h"
-+#include <zlib.h>
- #include <stdlib.h>
-
- #ifdef DEBUG_MEM_LEAK
diff --git a/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild b/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild
deleted file mode 100644
index 53331b30..00000000
--- a/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-inherit toolchain-funcs
-
-MY_P="mbtPdfAsm-${PV}"
-
-DESCRIPTION="Tool to assemble/merge, extract information from, and update the metadata in PDF"
-HOMEPAGE="http://thierry.schmit.free.fr/dev/mbtPdfAsm/mbtPdfAsm2.html"
-SRC_URI="http://thierry.schmit.free.fr/spip/IMG/gz/${MY_P}.tar.gz
- http://sbriesen.de/gentoo/distfiles/${P}-manual.pdf.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-S="${WORKDIR}"
-
-# https://bugs.gentoo.org/show_bug.cgi?id=594668
-patch_to_standard() {
- local i j b
- b='[^_abcdefghijklmnopqrstuvwxyzABCDEFGHIJLKMNOPQRSTUVWXYZ0123456789]'
- for i
- do j=$i
- while ! case $j in
- *__*)
- false;;
- esac
- do j=${j%%__*}_m_${j#*__}
- done
- case $i in
- _[ABCDEFGHIJKLMNOPQRSTUVWXYZ]*)
- j=_m$i;;
- esac
- [ "$j" != "$i" ] || die
- einfo "Renaming $i -> $j"
- sed -i \
- -e "s/^$i\$/$j/g" \
- -e "s/^$i\($b\)/$j\1/g" \
- -e "s/\($b\)$i\($b\)/\1$j\2/g" \
- -- *.c* *.h* || die
- done
-}
-
-src_prepare() {
- eapply -p0 \
- "${FILESDIR}/${P}-makefile.diff" \
- "${FILESDIR}/${P}-64bit.diff" \
- "${FILESDIR}/${P}-main.diff"
-
- # use system zlib
- eapply "${FILESDIR}/${P}-zlib.diff"
- mv "zlib.h" "zlib.h.disabled" || die
-
- patch_to_standard $(sed -n -e 's/^[[:space:]]*\#define[[:space:]]*\(_[ABCDEFGHIJKLMNOPQRSTUVWXYZ][^[:space:]]*\|[^[:space:]]*__[^[:space:]]*\).*/\1/p' \
- -- *.c* *.h*)
- default
-}
-
-src_compile() {
- emake CC="$(tc-getCXX)" || die "emake failed"
-}
-
-src_install() {
- dobin mbtPdfAsm || die "install failed"
- insinto "/usr/share/doc/${PF}"
- newins ${P}-manual.pdf mbtPdfAsm.pdf
-}
diff --git a/app-text/mbtpdfasm/metadata.xml b/app-text/mbtpdfasm/metadata.xml
deleted file mode 100644
index c030c08d..00000000
--- a/app-text/mbtpdfasm/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <longdescription lang="en">
- This program can be used to assemble/merge PDF files, extract
- information from PDF files, and update the metadata in PDF files.
- </longdescription>
-</pkgmetadata>
diff --git a/app-text/psjoin/ChangeLog b/app-text/psjoin/ChangeLog
new file mode 100644
index 00000000..8eb401e6
--- /dev/null
+++ b/app-text/psjoin/ChangeLog
@@ -0,0 +1,6 @@
+# ChangeLog for app-text/psjoin
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 31 Jul 2013; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/app-text/psjoin/Manifest b/app-text/psjoin/Manifest
index ccf96946..03dd9e4a 100644
--- a/app-text/psjoin/Manifest
+++ b/app-text/psjoin/Manifest
@@ -1 +1 @@
-DIST psjoin-0.3.pl 5122 SHA512 5dd86a6c863f28bcf4e560ce0a1967a2d316f97ef702ac47dbe0db148c2d4164a973de0a8d0e3aa3ef57a08f92520129cebb99f4bce5a539401f1fc273a8c399
+DIST psjoin-0.3 5122 SHA256 ac7a3f9512b1f6b0ea2bab4b6832431977649e88a0e6abd752fc097a8c0cd583 SHA512 5dd86a6c863f28bcf4e560ce0a1967a2d316f97ef702ac47dbe0db148c2d4164a973de0a8d0e3aa3ef57a08f92520129cebb99f4bce5a539401f1fc273a8c399 WHIRLPOOL 2c8b4b3309dd5d9ee3955c8d7944e5f911e842710a65c7c250210028f86598695ab0d99076790a630028346ad5898a51afc22786826f039294c81671f4b5285b
diff --git a/app-text/psjoin/metadata.xml b/app-text/psjoin/metadata.xml
index 97dd82a1..8730610f 100644
--- a/app-text/psjoin/metadata.xml
+++ b/app-text/psjoin/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/app-text/psjoin/psjoin-0.3.ebuild b/app-text/psjoin/psjoin-0.3.ebuild
index 885cc2f2..a8efb2ac 100644
--- a/app-text/psjoin/psjoin-0.3.ebuild
+++ b/app-text/psjoin/psjoin-0.3.ebuild
@@ -1,16 +1,19 @@
-# Copyright 2013-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
+inherit eutils
+
DESCRIPTION="concatenate postscript files. From new PostScript Utilities"
-HOMEPAGE="http://t-sato.in.coocan.jp/tools/psjoin.html"
-SRC_URI="http://t-sato.in.coocan.jp/tools/${PN} -> ${P}.pl"
+HOMEPAGE="http://homepage3.nifty.com/tsato/tools/psjoin.html"
+SRC_URI="http://homepage3.nifty.com/tsato/tools/${PN} -> ${P}"
LICENSE="psutils"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
@@ -19,7 +22,11 @@ DEPEND="${RDEPEND}
src_unpack() {
mkdir -- "${S}"
- cp -p -- "${DISTDIR}/${P}.pl" "${S}/${PN}"
+ cp -p -- "${DISTDIR}/${P}" "${S}/${PN}"
+}
+
+src_prepare() {
+ epatch_user
}
src_install() {
diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog
new file mode 100644
index 00000000..7e0ff505
--- /dev/null
+++ b/app-text/stardict/ChangeLog
@@ -0,0 +1,30 @@
+# ChangeLog for app-text/stardict
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 17 Apr 2015; Martin Väth <martin@mvath.de>:
+ Version bump. Remove old ebuild
+
+ 24 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump. Remove old ebuild
+
+ 14 Jun 2014; Martin Väth <martin@mvath.de>:
+ Bump from main tree. Remove old ebuild
+
+ 31 May 2013; Martin Väth <martin@mvath.de>:
+ Fix linking without gnome-doc-util. Pull stability from main tree.
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 05 May 2012; Martin Väth <martin@mvath.de>:
+ Update pkgconfig dependency change from main tree.
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base. Add zlib compatibility patch from main tree.
+
+ 24 Jan 2012; Martin Väth <martin@mvath.de>:
+ Copy from tree to make gnome-doc-utils optional. Clean old ChangeLog.
diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index 47e0fdee..bf64d7c7 100644
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -1,4 +1,3 @@
DIST QQWry.Dat.bz2 4114875 SHA256 3eda90ee8ea13ec88767336b078d2dfe2c971d6a31df60f409d526e3e29a4f83 SHA512 46fd677359a2144429eb9d16131ca6b19db1c086fa93e275aa3d702d3024a65d54064df931d1ed2ba5b0c1f7d9595a284f2a8995d9cd5aac96a45216422dc9ae WHIRLPOOL 456bab65658a8af76160f162fc66868c8a74653a88a1a115e2a20dd90ba9ae8a93b1aa1ee9856cc811d1b1229ca910868ea5db764a119ae9b31cbabf962cab5f
DIST WyabdcRealPeopleTTS.tar.bz2 84329208 SHA256 96a398eaef3e84f6f23e61683e6439913a4d44055e695dd4a1936f9340d64870 SHA512 1553e62c139ecb005bb04163147d94aa58e4ba7f9ee3172b760c6e4776587c12bf816c42e0131c82195b7c738ec9ee5082f39b974790f5cacd522367919beaa0 WHIRLPOOL 210c121c25c7726cee62c2f2beb3186f0799d68c5537442eda967694f176cbbbc6d09a8c3759de093226e283ae651348ed7173a9f93bbf776325fb656e19720c
-DIST stardict-3.0.6.tar.bz2 9341740 SHA512 81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658
-DIST stardict-4.0.0_pre20170304.tar.xz 3603012 SHA512 ec27bb95069d727fd96cb30f2d7ad94992cc53e55903b373612e29265263ea5da2c8a25f6c9618db50dc38c33efebe13324c2b8eb09b198559a1ee70029f0b6a
+DIST stardict-3.0.6.tar.bz2 9341740 SHA256 6a0a695a8977604e0509a3db1bc6a67e53599b14f29494ba942f21d2c26b82e7 SHA512 81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658 WHIRLPOOL 9502af310d5eba5ed23457fff9e9f00e2d8453873cece3c20e2c5daf861bd665fc7b9c8e292be5b1d886f9a9fd0d5ad9bd1d8fbd043d221e6637c1c8185f444f
diff --git a/app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch b/app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch
new file mode 100644
index 00000000..6a320bd4
--- /dev/null
+++ b/app-text/stardict/files/stardict-3.0.3-zlib-1.2.5.2.patch
@@ -0,0 +1,39 @@
+http://bugs.gentoo.org/401887
+
+diff --git a/lib/src/libcommon.cpp b/lib/src/libcommon.cpp
+index 16770a3..a4299e7 100644
+--- a/lib/src/libcommon.cpp
++++ b/lib/src/libcommon.cpp
+@@ -614,7 +614,7 @@ int unpack_zlib(const char* arch_file_name, const char* out_file_name)
+ return EXIT_FAILURE;
+ }
+ while(true) {
+- len = gzread(get_impl(in), buf, buffer_size);
++ len = gzread((gzFile)get_impl(in), buf, buffer_size);
+ if(len < 0) {
+ g_critical(read_file_err, arch_file_name, "");
+ return EXIT_FAILURE;
+@@ -871,3 +871,8 @@ int remove_recursive(const std::string& path)
+ return res;
+ }
+ }
++
++int gzclose_compat(void * file)
++{
++ return gzclose ((gzFile)file);
++}
+diff --git a/lib/src/libcommon.h b/lib/src/libcommon.h
+index 10f13b4..bdcbf2f 100644
+--- a/lib/src/libcommon.h
++++ b/lib/src/libcommon.h
+@@ -187,8 +187,9 @@ namespace clib {
+ typedef ResourceWrapper<FILE, FILE*, int, fclose> File;
+ }
+
++extern int gzclose_compat(void * file);
+ namespace zip {
+-typedef ResourceWrapper<void, void*, int, gzclose> gzFile;
++typedef ResourceWrapper<void, void*, int, gzclose_compat> gzFile;
+ }
+
+ /* Create a new temporary file. Return file name in file name encoding.
diff --git a/app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch b/app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch
deleted file mode 100644
index 49cb2842..00000000
--- a/app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From adb01aafd94b6bd5b5cc49889f4f09d483ee5ac4 Mon Sep 17 00:00:00 2001
-From: Nikolay Korotkiy <sikmir@gmail.com>
-Date: Thu, 1 Sep 2016 14:11:41 +0300
-Subject: [PATCH] tabfile: incorrectly handles whitespace in file name
-
-Signed-off-by: Andrew Savchenko <bircoph@gmail.com>
----
- tools/src/libtabfile.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tools/src/libtabfile.cpp b/tools/src/libtabfile.cpp
-index dda256a..2ee9dfd 100644
---- a/tools/src/libtabfile.cpp
-+++ b/tools/src/libtabfile.cpp
-@@ -22,6 +22,7 @@
- #include <cstring>
- #include <cstdlib>
- #include <string>
-+#include <sstream>
- #include <glib/gstdio.h>
- #include <glib.h>
-
-@@ -228,9 +229,10 @@ static bool write_dictionary(const char *filename, GArray *array)
- g_message("%s wordcount: %d.", get_impl(basefilename), array->len);
-
- #ifndef _WIN32
-- std::string command(std::string("dictzip ") + dicfilename);
-+ std::stringstream command;
-+ command << "dictzip \"" << dicfilename << "\"";
- int result;
-- result = system(command.c_str());
-+ result = system(command.str().c_str());
- if (result == -1) {
- g_print("system() error!\n");
- }
---
-2.10.2
-
diff --git a/app-text/stardict/files/stardict-strip-canberra.patch b/app-text/stardict/files/stardict-strip-canberra.patch
deleted file mode 100644
index 8522bb54..00000000
--- a/app-text/stardict/files/stardict-strip-canberra.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 1/dict/src/desktop.cpp
-+++ 1/dict/src/desktop.cpp
-@@ -39,9 +39,11 @@
-
-
- #ifndef _WIN32
-+#if 0
- # include "canberra.h"
- # include "canberra-gtk.h"
- #endif
-+#endif
-
-
-
-@@ -176,14 +178,18 @@
- return; // error
- }
- #else
-+#if 0
- if (conf->get_bool_at("dictionary/always_use_sound_play_command")) {
-+#endif
- const std::string &playcmd=
- conf->get_string_at("dictionary/sound_play_command");
- spawn_command(playcmd.c_str(), filename.c_str());
-+#if 0
- } else {
- ca_context_play(ca_gtk_context_get(), 0, CA_PROP_MEDIA_FILENAME, filename.c_str(), NULL);
- }
- #endif
-+#endif
- }
-
- void play_video_file(const std::string& filename)
diff --git a/app-text/stardict/metadata.xml b/app-text/stardict/metadata.xml
index 6d58ce6c..ea6a8b5e 100644
--- a/app-text/stardict/metadata.xml
+++ b/app-text/stardict/metadata.xml
@@ -1,54 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- <description>maintainer of the updates in the mv overlay</description>
- </maintainer>
- <maintainer type="person">
- <email>bircoph@gentoo.org</email>
- <name>Andrew Savchenko</name>
- </maintainer>
- <longdescription>
- StarDict is an international dictionary Software. It has powerful features
- such as "Glob-style pattern matching", "Scan selection word," "Fuzzy
- query," etc. Stardict Version3.0 has developed a lot of new functions, such
- as Full-text translation, Net Dict.
- </longdescription>
- <use>
- <flag name="advertisement">Enable stardict advertisements plugin</flag>
- <flag name="cal">Enable calendar support using cal program</flag>
- <flag name="canberra">Use libcanberra for sound playing</flag>
- <flag name="dictdotcn">Enable dict.cn network plugin (for Chinese language)</flag>
- <flag name="espeak">Enable text to speech synthesizer plugin using
- <pkg>app-accessibility/espeak</pkg> engine</flag>
- <flag name="flite">Enable text to speech synthesizer plugin using
- <pkg>app-accessibility/flite</pkg> engine</flag>
- <flag name="fortune">Enable plugin to read fortune messages using
- <pkg>games-misc/fortune-mod</pkg>. You may consider installing
- <pkg>games-misc/fortune-mod-all</pkg> to get all fortune messages.</flag>
- <flag name="gucharmap">Enable plugin for unicode symbols description using
- <pkg>gnome-extra/gucharmap</pkg></flag>
- <flag name="htmlparse">Enable plugin to parse dictionaries with html content</flag>
- <flag name="info">Enable plugin to read info pages</flag>
- <flag name="man">Enable plugin to read manual pages</flag>
- <flag name="powerwordparse">Enable plugin to parse powerword dictionaries</flag>
- <flag name="pronounce">Install WyabdcRealPeopleTTS package (it is just many .wav files)
- to make StarDict pronounce English words</flag>
- <flag name="qqwry">Enable QQWry plugin, which provides information (in Chinese language)
- about geographical positions, owner, etc. for IP addresses</flag>
- <flag name="tools">Build and install dictionary management tools and converters from
- various dictionary formats</flag>
- <flag name="updateinfo">Enable plugin to check for stardict updates</flag>
- <flag name="wikiparse">Enable plugin to parse dictionaries in wikimedia format</flag>
- <flag name="wordnet">Enable wordnet plugin to find similar English words using
- lexical database</flag>
- <flag name="xdxfparse">Enable plugin to parse dictionaries in xdxf (XML Dictionary
- eXchange Format)</flag>
- <flag name="youdaodict">Enable youdao.com network plugin (for Chinese language)</flag>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+ <longdescription>
+ StarDict is an international dictionary Software. It has powerful features
+ such as "Glob-style pattern matching", "Scan selection word," "Fuzzy
+ query," etc. Stardict Version3.0 has developed a lot of new functions, such
+ as Full-text translation, Net Dict.
+ </longdescription>
+ <use>
+ <flag name='espeak'>Enable text to speech synthesizer using espeak
+ engine</flag>
+ <flag name='gnome2'>Enable deprecated gnome2 support</flag>
+ <flag name='gucharmap'>Enable gucharmap dictionary plugin</flag>
+ <flag name='pronounce'>Install WyabdcRealPeopleTTS package (it is just
+ many .wav files) to make StarDict pronounce English words</flag>
+ <flag name='qqwry'>Enable QQWry plugin, which provides information (in
+ Chinese language) about geographical positions, owner, etc. for IP
+ addresses</flag>
+ <flag name='tools'>Build and install the extra stardict tools</flag>
</use>
- <upstream>
- <remote-id type="sourceforge">stardict-4</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/app-text/stardict/stardict-3.0.6-r4.ebuild b/app-text/stardict/stardict-3.0.6-r4.ebuild
deleted file mode 100644
index dad3b6bc..00000000
--- a/app-text/stardict/stardict-3.0.6-r4.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
-# their indexes seem to be in a different format. So we'll keep them
-# seperate for now.
-
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit autotools flag-o-matic gnome2 python-single-r1
-
-DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://stardict-4.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-4/${P}.tar.bz2
- pronounce? ( https://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
- qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
-
-LICENSE="CPL-1.0 GPL-3 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="advertisement debug dictdotcn espeak examples gnome +gucharmap
-+htmlparse man perl +powerwordparse pronounce python qqwry spell
-tools updateinfo +wikiparse +wordnet +xdxfparse"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.16:2
- dev-libs/libsigc++:2=
- sys-libs/zlib:=
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.20:2
- x11-libs/libX11
- x11-libs/pango
- gucharmap? ( gnome-extra/gucharmap:0= )
- spell? ( >=app-text/enchant-1.2:= )
- tools? (
- dev-libs/libpcre:=
- dev-libs/libxml2:=
- virtual/mysql
- python? ( ${PYTHON_DEPS} )
- )
-"
-RDEPEND="${COMMON_DEPEND}
- espeak? ( >=app-accessibility/espeak-1.29 )
- perl? ( dev-lang/perl )
-"
-DEPEND="${COMMON_DEPEND}
- gnome? (
- app-text/docbook-xml-dtd:4.3
- app-text/gnome-doc-utils
- dev-libs/libxslt
- )
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
-"
-REQUIRED_USE="tools? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
-
-# docs are messy, installed manually below
-DOCS=""
-
-src_prepare() {
- # From Fedora
- # Remove unneeded sigc++ header files to make it sure
- # that we are using system-wide libsigc++
- # (and these does not work on gcc43)
- find dict/src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f || die
-
- # libsigc++ started to require c++11 support
- append-cxxflags "-std=c++11"
-
- if use python; then
- local f
- # force python shebangs handlable by python_doscript
- for f in tools/src/*.py; do
- [[ $(head -n1 "${f}") =~ ^#! ]] || continue
- sed -i '1 s|.*|#!/usr/bin/python|' tools/src/*.py || die
- done
- # script contains UTF-8 symbols, but has no ecoding set
- sed -i '1 a # -*- coding: utf-8 -*-' tools/src/uyghur2dict.py || die
- fi
-
- eapply_user
- if ! use gnome
- then sed -i \
- -e 's/GNOME_DOC_INIT/GNOME_DOC_INIT([0.32],[:],[:])/' \
- -e '/AM_GCONF_SOURCE/d' \
- -e '/help\/Makefile/d' \
- dict/configure.ac
- sed -i \
- -e 's/ help / /' \
- dict/Makefile.am
- sed -i \
- -e 's/\(libstardict_la_LIBADD = \)/\1 -lgmodule-2.0 /' \
- dict/src/lib/Makefile.am
- eautoreconf
- fi
- gnome2_src_prepare
-}
-
-src_configure() {
- # Hint: EXTRA_ECONF="--enable-gnome-support" and manual install of
- # libbonobo-2, libgnome-2, libgnomeui-2, gconf-2 and orbit-2 will
- # give you GNOME 2.x support, that is otherwise considered deprecated
- # because of the deep GNOME 2.x core library dependencies
-
- # Festival plugin crashes, bug 188684. Disable for now.
- gnome2_src_configure \
- --disable-festival \
- --disable-gnome-support \
- --disable-gpe-support \
- --disable-schemas-install \
- --disable-scrollkeeper \
- $(use_enable advertisement) \
- $(use_enable dictdotcn) \
- $(use_enable debug) \
- $(use_enable espeak) \
- $(use_enable gucharmap) \
- $(use_enable htmlparse) \
- $(use_enable qqwry) \
- $(use_enable powerwordparse) \
- $(use_enable spell) \
- $(use_enable tools) \
- $(use_enable updateinfo) \
- $(use_enable wikiparse) \
- $(use_enable wordnet) \
- $(use_enable xdxfparse)
-}
-
-src_install() {
- gnome2_src_install
-
- dodoc AUTHORS ChangeLog README
-
- docinto dict
- dodoc dict/{AUTHORS,ChangeLog,README,TODO}
- dodoc dict/doc/{Documentation,FAQ,HowToCreateDictionary,Skins,StarDictFileFormat,TextualDictionaryFileFormat,Translation}
-
- docinto lib
- dodoc lib/{AUTHORS,ChangeLog,README}
-
- if use examples; then
- insinto /usr/share/doc/${PF}/dict
- doins dict/doc/stardict-textual-dict*
- fi
-
- if use qqwry; then
- insinto /usr/share/${PN}/data
- doins ../QQWry.Dat
- fi
-
- if use pronounce; then
- docinto WyabdcRealPeopleTTS
- dodoc ../WyabdcRealPeopleTTS/{README,readme.txt}
- rm -f ../WyabdcRealPeopleTTS/{README,readme.txt}
- insinto /usr/share
- doins -r ../WyabdcRealPeopleTTS
- fi
-
- # noinst_PROGRAMS with ${PN}_ prefix from tools/src/Makefile.am wrt #292773
- # and additional scripts from tools dir
- if use tools; then
- local app
- local apps="${PN}-editor pydict2dic olddic2newdic oxford2dic directory2dic
- dictd2dic wquick2dic ec50 directory2treedic treedict2dir jdictionary mova
- xmlinout soothill kanjidic2 powerword kdic 21tech 21shiji buddhist
- tabfile cedict edict duden ${PN}-dict-update degb2utf frgb2utf
- jpgb2utf gmx2utf rucn kingsoft wikipedia wikipediaImage babylon
- ${PN}2txt ${PN}-verify fest2dict i2e2dict downloadwiki
- ooo2dict myspell2dic exc2i2e dictbuilder tabfile2sql KangXi Unihan
- xiaoxuetang-ja wubi ydp2dict wordnet lingvosound2resdb
- resdatabase2dir dir2resdatabase ${PN}-index sd2foldoc ${PN}-text2bin
- ${PN}-bin2text ${PN}-repair"
-
- use perl && apps+=" dicts-dump.pl ncce2stardict.pl parse-oxford.perl"
- use python && apps+=" hanzim2dict.py jm2stardict.py lingea-trd-decoder.py
- makevietdict.py uyghur2dict.py"
-
- for app in ${apps}; do
- if [[ "${app}" =~ ^${PN} ]]; then
- dobin "tools/src/${app}"
- else
- newbin "tools/src/${app}" "${PN}_${app}"
- fi
- done
- use python && python_doscript "${ED}"usr/bin/*.py
-
- docinto tools
- dodoc tools/{AUTHORS,ChangeLog,README}
-
- if use examples; then
- insinto /usr/share/doc/${PF}/tools
- doins tools/src/{dictbuilder.{example,readme},example.ifo,example_treedict.tar.bz2}
- fi
- fi
-}
-
-pkg_postinst() {
- elog
- elog "Note: festival text to speech (TTS) plugin is not built. To use festival"
- elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:'
- elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
- elog '"echo %s | festival --tts"'
- elog
- elog "You will now need to install ${PN} dictionary files. If"
- elog "you have not, execute the below to get a list of dictionaries:"
- elog " emerge -s ${PN}-"
- elog
- elog "Additionally you may install any stardict dictionary from the net"
- elog "by unpacking it to:"
- elog " /usr/share/stardict/dic"
- elog
-
- gnome2_pkg_postinst
-}
diff --git a/app-text/stardict/stardict-3.0.6.ebuild b/app-text/stardict/stardict-3.0.6.ebuild
new file mode 100644
index 00000000..dabfe56f
--- /dev/null
+++ b/app-text/stardict/stardict-3.0.6.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
+# their indexes seem to be in a different format. So we'll keep them
+# seperate for now.
+
+# NOTE: Festival plugin crashes, bug 188684. Disable for now.
+
+GNOME2_LA_PUNT=yes
+GCONF_DEBUG=no
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
+HOMEPAGE="http://stardict-4.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}-4/${P}.tar.bz2
+ pronounce? ( http://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
+ qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
+
+LICENSE="CPL-1.0 GPL-3 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="espeak gnome gnome2 gucharmap qqwry pronounce spell tools"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.16:2=
+ dev-libs/libsigc++:2=
+ sys-libs/zlib:=
+ >=x11-libs/gtk+-2.20:2=
+ gnome2? (
+ >=gnome-base/libbonobo-2
+ >=gnome-base/libgnome-2
+ >=gnome-base/libgnomeui-2
+ >=gnome-base/gconf-2
+ >=gnome-base/orbit-2
+ )
+ gucharmap? ( >=gnome-extra/gucharmap-2.22.1:0 )
+ spell? ( >=app-text/enchant-1.2 )
+ tools? (
+ dev-libs/libpcre:=
+ dev-libs/libxml2:=
+ virtual/mysql
+ )"
+RDEPEND="${COMMON_DEPEND}
+ espeak? ( >=app-accessibility/espeak-1.29 )"
+DEPEND="${COMMON_DEPEND}
+ gnome? (
+ app-text/docbook-xml-dtd:4.3
+ app-text/gnome-doc-utils
+ dev-libs/libxslt
+ )
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+src_prepare() {
+ if ! use gnome
+ then sed -i \
+ -e 's/GNOME_DOC_INIT/GNOME_DOC_INIT([0.32],[:],[:])/' \
+ -e '/AM_GCONF_SOURCE/d' \
+ -e '/help\/Makefile/d' \
+ dict/configure.ac
+ sed -i \
+ -e 's/ help / /' \
+ dict/Makefile.am
+ sed -i \
+ -e 's/\(libstardict_la_LIBADD = \)/\1 -lgmodule-2.0 /' \
+ dict/src/lib/Makefile.am
+ eautoreconf
+ fi
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable tools) \
+ --disable-scrollkeeper \
+ $(use_enable spell) \
+ $(use_enable gucharmap) \
+ --disable-festival \
+ $(use_enable espeak) \
+ $(use_enable qqwry) \
+ --disable-updateinfo \
+ $(use_enable gnome2 gnome-support) \
+ --disable-gpe-support \
+ --disable-schemas-install
+}
+
+src_install() {
+ gnome2_src_install
+
+ dodoc dict/doc/{Documentation,FAQ,HACKING,HowToCreateDictionary,Skins,StarDictFileFormat,Translation}
+
+ if use qqwry; then
+ insinto /usr/share/${PN}/data
+ doins ../QQWry.Dat
+ fi
+
+ if use pronounce; then
+ docinto WyabdcRealPeopleTTS
+ dodoc ../WyabdcRealPeopleTTS/{README,readme.txt}
+ rm -f ../WyabdcRealPeopleTTS/{README,readme.txt}
+ insinto /usr/share
+ doins -r ../WyabdcRealPeopleTTS
+ fi
+
+ # noinst_PROGRAMS with ${PN}_ prefix from tools/src/Makefile.am wrt #292773
+ if use tools; then
+ local app
+ local apps="${PN}-editor pydict2dic olddic2newdic oxford2dic directory2dic
+ dictd2dic wquick2dic ec50 directory2treedic treedict2dir jdictionary mova
+ xmlinout soothill kanjidic2 powerword kdic 21tech 21shiji buddhist
+ tabfile cedict edict duden ${PN}-dict-update degb2utf frgb2utf
+ jpgb2utf gmx2utf rucn kingsoft wikipedia wikipediaImage babylon
+ ${PN}2txt ${PN}-verify fest2dict i2e2dict downloadwiki
+ ooo2dict myspell2dic exc2i2e dictbuilder tabfile2sql KangXi Unihan
+ xiaoxuetang-ja wubi ydp2dict wordnet lingvosound2resdb
+ resdatabase2dir dir2resdatabase ${PN}-index sd2foldoc ${PN}-text2bin
+ ${PN}-bin2text ${PN}-repair"
+
+ for app in ${apps}; do
+ newbin tools/src/${app} ${PN}_${app}
+ done
+ fi
+}
+
+pkg_postinst() {
+ elog "Note: festival text to speech (TTS) plugin is not built. To use festival"
+ elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:'
+ elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
+ elog '"echo %s | festival --tts"'
+ elog
+ elog "You will now need to install ${PN} dictionary files. If"
+ elog "you have not, execute the below to get a list of dictionaries:"
+ elog
+ elog " emerge -s ${PN}-"
+
+ gnome2_pkg_postinst
+}
diff --git a/app-text/stardict/stardict-4.0.0_pre20170304.ebuild b/app-text/stardict/stardict-4.0.0_pre20170304.ebuild
deleted file mode 100644
index ccebab56..00000000
--- a/app-text/stardict/stardict-4.0.0_pre20170304.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
-# their indexes seem to be in a different format. So we'll keep them
-# seperate for now.
-
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit autotools flag-o-matic gnome2 python-single-r1
-
-DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://stardict-4.sourceforge.net/
- https://github.com/huzheng001/stardict-3"
-SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz
- pronounce? ( https://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
- qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
-
-LICENSE="CPL-1.0 GPL-3 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="advertisement cal canberra debug dictdotcn espeak examples flite
-fortune gnome gucharmap +htmlparse info man perl +powerwordparse
-pronounce python qqwry spell tools updateinfo +wikiparse +wordnet
-+xdxfparse youdaodict"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.32:2
- dev-libs/libsigc++:2=
- canberra? ( media-libs/libcanberra[gtk3] )
- sys-libs/zlib:=
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/pango
- espeak? ( >=app-accessibility/espeak-1.29 )
- flite? ( app-accessibility/flite )
- gucharmap? ( gnome-extra/gucharmap:2.90= )
- spell? ( >=app-text/enchant-1.2:= )
- tools? (
- dev-db/mysql-connector-c
- dev-libs/expat
- dev-libs/libpcre:=
- dev-libs/libxml2:=
- python? ( ${PYTHON_DEPS} )
- )
-"
-RDEPEND="${COMMON_DEPEND}
- info? ( sys-apps/texinfo )
- fortune? ( games-misc/fortune-mod )
- perl? ( dev-lang/perl )
-"
-DEPEND="${COMMON_DEPEND}
- gnome? (
- app-text/docbook-xml-dtd:4.3
- app-text/gnome-doc-utils
- dev-libs/libxslt
- )
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
-"
-REQUIRED_USE="tools? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
-
-# docs are messy, installed manually below
-DOCS=""
-
-PATCHES=( "${FILESDIR}/${PN}-4.0.0_pre20160518-tabfile.patch" )
-
-src_prepare() {
- # From Fedora
- # Remove unneeded sigc++ header files to make it sure
- # that we are using system-wide libsigc++
- # (and these does not work on gcc43)
- find dict/src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f || die
-
- # libsigc++ started to require c++11 support
- append-cxxflags "-std=c++11"
-
- if use python; then
- local f
- # force python shebangs handlable by python_doscript
- for f in tools/src/*.py; do
- [[ $(head -n1 "${f}") =~ ^#! ]] || continue
- sed -i '1 s|.*|#!/usr/bin/python|' tools/src/*.py || die
- done
- # script contains UTF-8 symbols, but has no ecoding set
- sed -i '1 a # -*- coding: utf-8 -*-' tools/src/uyghur2dict.py || die
- fi
-
- # bug 604318
- sed -i '/AM_GCONF_SOURCE_2/d' dict/configure.ac || die
-
- if ! use gnome
- then sed -i \
- -e '/GNOME_DOC_INIT/d' \
- -e '/help\/Makefile/d' \
- dict/configure.ac || die
- sed -i \
- -e 's/ help / /' \
- dict/Makefile.am || die
- sed -i \
- -e 's/\(libstardict_la_LIBADD = \)/\1 -lgmodule-2.0 /' \
- dict/src/lib/Makefile.am || die
- fi
- if ! use canberra
- then sed -i \
- -e 's/ libcanberra libcanberra-gtk3//' \
- dict/configure.ac || die
- eapply "${FILESDIR}/${PN}-strip-canberra.patch"
- fi
-
- eapply_user
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # Festival plugin crashes, bug 188684. Disable for now.
- # Gnome2 support is disabled due to deprecation request, bug 644346
- gnome2_src_configure \
- --disable-darwin-support \
- --disable-festival \
- --disable-gnome-support \
- --disable-gpe-support \
- --disable-maemo-support \
- --disable-schemas-install \
- --disable-scrollkeeper \
- $(use_enable advertisement) \
- $(use_enable cal) \
- $(use_enable debug) \
- $(use_enable dictdotcn) \
- $(use_enable espeak) \
- $(use_enable flite) \
- $(use_enable fortune) \
- $(use_enable gucharmap) \
- $(use_enable htmlparse) \
- $(use_enable info) \
- $(use_enable man) \
- $(use_enable powerwordparse) \
- $(use_enable qqwry) \
- $(use_enable spell) \
- $(use_enable tools) \
- $(use_enable updateinfo) \
- $(use_enable wikiparse) \
- $(use_enable wordnet) \
- $(use_enable xdxfparse) \
- $(use_enable youdaodict)
-}
-
-src_install() {
- gnome2_src_install
-
- dodoc AUTHORS ChangeLog README
-
- docinto dict
- dodoc dict/{AUTHORS,ChangeLog,README,TODO}
- dodoc dict/doc/{Documentation,FAQ,HowToCreateDictionary,Skins,StarDictFileFormat,TextualDictionaryFileFormat,Translation}
- dodoc -r dict/doc/wiki
-
- docinto lib
- dodoc lib/{AUTHORS,ChangeLog,README}
-
- if use examples; then
- insinto /usr/share/doc/${PF}/dict
- doins dict/doc/stardict-textual-dict*
- fi
-
- if use qqwry; then
- insinto /usr/share/${PN}/data
- doins ../QQWry.Dat
- fi
-
- if use pronounce; then
- docinto WyabdcRealPeopleTTS
- dodoc ../WyabdcRealPeopleTTS/{README,readme.txt}
- rm -f ../WyabdcRealPeopleTTS/{README,readme.txt}
- insinto /usr/share
- doins -r ../WyabdcRealPeopleTTS
- fi
-
- # noinst_PROGRAMS with ${PN}_ prefix from tools/src/Makefile.am wrt #292773
- # and additional scripts from tools dir
- if use tools; then
- local app
- local apps="${PN}-editor pydict2dic olddic2newdic oxford2dic directory2dic dictd2dic
- wquick2dic ec50 directory2treedic treedict2dir jdictionary mova xmlinout
- soothill kanjidic2 powerword kdic 21tech 21shiji buddhist tabfile
- cedict edict duden ${PN}-dict-update degb2utf frgb2utf jpgb2utf gmx2utf
- rucn kingsoft kingsoft2 wikipedia wikipediaImage babylon ${PN}2txt ${PN}-verify
- fest2dict i2e2dict downloadwiki ooo2dict myspell2dic exc2i2e
- dictbuilder tabfile2sql KangXi Unihan xiaoxuetang-ja wubi ydp2dict
- wordnet lingvosound2resdb resdatabase2dir dir2resdatabase ${PN}-index
- sd2foldoc
- ${PN}-text2bin ${PN}-bin2text ${PN}-repair"
-
- use perl && apps+=" dicts-dump.pl ncce2stardict.pl parse-oxford.perl"
- use python && apps+=" hanzim2dict.py jm2stardict.py lingea-trd-decoder.py
- makevietdict.py uyghur2dict.py"
-
- for app in ${apps}; do
- if [[ "${app}" =~ ^${PN} ]]; then
- dobin "tools/src/${app}"
- else
- newbin "tools/src/${app}" "${PN}_${app}"
- fi
- done
- use python && python_doscript "${ED}"usr/bin/*.py
-
- docinto tools
- dodoc tools/{AUTHORS,ChangeLog,README}
-
- if use examples; then
- insinto /usr/share/doc/${PF}/tools
- doins tools/src/{dictbuilder.{example,readme},example.ifo,example_treedict.tar.bz2}
- fi
- fi
-}
-
-pkg_postinst() {
- elog
- elog "Note: festival text to speech (TTS) plugin is not built. To use festival"
- elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:'
- elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
- elog '"echo %s | festival --tts"'
- elog
- elog "You will now need to install ${PN} dictionary files. If"
- elog "you have not, execute the below to get a list of dictionaries:"
- elog " emerge -s ${PN}-"
- elog
- elog "Additionally you may install any stardict dictionary from the net"
- elog "by unpacking it to:"
- elog " /usr/share/stardict/dic"
- elog
-
- gnome2_pkg_postinst
-}
diff --git a/dev-cpp/cpplint/ChangeLog b/dev-cpp/cpplint/ChangeLog
new file mode 100644
index 00000000..55c0aeb9
--- /dev/null
+++ b/dev-cpp/cpplint/ChangeLog
@@ -0,0 +1,90 @@
+ ChangeLog for dev-cpp/cpplint
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*cpplint-99999999 (24 May 2015)
+
+ 24 May 2015; Martin Väth <martin@mvath.de>:
+ Update to github repository, since anything else is no longer available
+
+*cpplint-141-r1 (18 Jan 2015)
+
+ 15 Feb 2015; Martin Väth <martin@mvath.de>:
+ Fix python-single-r1 usage. Remove non-working python versions
+
+ 18 Jan 2014; Martin Väth <martin@mvath.de>:
+ Use new-style python dependency. Fix shebang
+
+*cpplint-141 (05 Dec 2014)
+
+ 05 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpplint-140 (20 Nov 2014)
+
+ 20 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpplint-137 (26 Aug 2014)
+
+ 26 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpplint-136 (16 Aug 2014)
+
+ 16 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Version files separately to save downloads
+
+*cpplint-135 (05 Aug 2014)
+
+ 05 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpplint-134 (09 Jun 2014)
+
+ 09 Jun 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpplint-120 (29 Dec 2013)
+
+ 29 Dec 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpplint-118 (09 Nov 2013)
+
+ 09 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpplint-116 (03 Nov 2013)
+
+ 03 Nov 2013; Martin Väth <martin@mvath.de>:
+ Follow svn version number. Fix download with static svn version
+
+*cpplint-3.260_p114 (26 Oct 2013)
+
+ 26 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpplint-3.260_p112 (26 Sep 2013)
+
+ 26 Sep 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpplint-3.231_p104 (12 Jun 2013)
+
+ 12 Jun 2013; Martin Väth <martin@mvath.de>:
+ Download with static svn version for consistent download: Finally, the
+ ebuild works even when it is out of date
+
+*cpplint-3.231 (08 Feb 2013)
+
+ 08 Feb 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Follow license renaming
+
+*cpplint-3.199 (25 Jul 2012)
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 25 Jul 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/dev-cpp/cpplint/cpplint-99999999.ebuild b/dev-cpp/cpplint/cpplint-99999999.ebuild
index 6752cda9..127d6581 100644
--- a/dev-cpp/cpplint/cpplint-99999999.ebuild
+++ b/dev-cpp/cpplint/cpplint-99999999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2012-2021 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{7,8,9,10} )
-EGIT_REPO_URI="https://github.com/google/styleguide.git"
-inherit elisp-common git-r3 python-single-r1
+EAPI=5
+PYTHON_COMPAT=( jython2_7 pypy python2_7 )
+EGIT_REPO_URI="git://github.com/google/styleguide.git"
+inherit elisp-common eutils git-r3 python-single-r1
RESTRICT="mirror"
DESCRIPTION="The google styleguide together with cpplint and an emacs file"
@@ -12,19 +13,18 @@ HOMEPAGE="https://github.com/google/styleguide"
SRC_URI=""
LICENSE="CC-BY-3.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE="emacs"
EMACSNAME="google-c-style"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-COMMON="emacs? ( app-editors/emacs )"
-BDEPEND="${COMMON}"
-RDEPEND="${PYTHON_DEPS}
+COMMON="emacs? ( virtual/emacs )"
+DEPEND="${COMMON}"
+RDEPEND="dev-lang/python
+ ${PYTHON_DEPS}
${COMMON}"
-PATCHES=("$FILESDIR"/"${PN}"-python3.patch)
-
src_prepare() {
if use emacs
then mkdir sitefile
@@ -44,7 +44,7 @@ EOF
-e '1s"^#!/usr/bin/env python$"#!'"${EPREFIX}/usr/bin/python"'"' \
-- "${S}/${PN}/${PN}.py" || die
python_fix_shebang "${S}"
- default
+ epatch_user
}
src_compile() {
diff --git a/dev-cpp/cpplint/files/cpplint-python3.patch b/dev-cpp/cpplint/files/cpplint-python3.patch
deleted file mode 100644
index 210c0ed0..00000000
--- a/dev-cpp/cpplint/files/cpplint-python3.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-# Compatibility patches for Python 3 by Martin V\"ath <mvath at google.com>
---- 1/cpplint/cpplint.py
-+++ 1/cpplint/cpplint.py
-@@ -55,8 +55,23 @@
-
- try:
- xrange # Python 2
-+ python2 = True
- except NameError:
- xrange = range # Python 3
-+ unicode = bool
-+ python2 = False
-+
-+def iteritems(obj, **kwargs):
-+ func = getattr(obj, "iteritems", None)
-+ if not func:
-+ func = obj.items
-+ return func(**kwargs)
-+
-+def itervalues(obj, **kwargs):
-+ func = getattr(obj, "itervalues", None)
-+ if not func:
-+ func = obj.values
-+ return func(**kwargs)
-
-
- _USAGE = """
-@@ -952,7 +967,7 @@
-
- def PrintErrorCounts(self):
- """Print a summary of errors by category, and the total."""
-- for category, count in self.errors_by_category.iteritems():
-+ for category, count in iteritems(self.errors_by_category):
- sys.stderr.write('Category \'%s\' errors found: %d\n' %
- (category, count))
- sys.stdout.write('Total errors found: %d\n' % self.error_count)
-@@ -4622,7 +4637,7 @@
-
- # Give opening punctuations to get the matching close-punctuations.
- matching_punctuation = {'(': ')', '{': '}', '[': ']'}
-- closing_punctuation = set(matching_punctuation.itervalues())
-+ closing_punctuation = set(itervalues(matching_punctuation))
-
- # Find the position to start extracting text.
- match = re.search(start_pattern, text, re.M)
-@@ -5570,7 +5585,7 @@
-
- # include_dict is modified during iteration, so we iterate over a copy of
- # the keys.
-- header_keys = include_dict.keys()
-+ header_keys = list(include_dict)
- for header in header_keys:
- (same_module, common_path) = FilesBelongToSameModule(abs_filename, header)
- fullpath = common_path + header
-@@ -6225,10 +6240,11 @@
-
- # Change stderr to write with replacement characters so we don't die
- # if we try to print something containing non-ASCII characters.
-- sys.stderr = codecs.StreamReaderWriter(sys.stderr,
-- codecs.getreader('utf8'),
-- codecs.getwriter('utf8'),
-- 'replace')
-+ if python2:
-+ sys.stderr = codecs.StreamReaderWriter(sys.stderr,
-+ codecs.getreader('utf8'),
-+ codecs.getwriter('utf8'),
-+ 'replace')
-
- _cpplint_state.ResetErrorCounts()
- for filename in filenames:
diff --git a/dev-cpp/cpplint/metadata.xml b/dev-cpp/cpplint/metadata.xml
index 645f788e..73a6d343 100644
--- a/dev-cpp/cpplint/metadata.xml
+++ b/dev-cpp/cpplint/metadata.xml
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
- <upstream>
- <remote-id type="github">google/styleguide</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/dev-libs/osformat/Manifest b/dev-libs/osformat/Manifest
deleted file mode 100644
index 24e41eb3..00000000
--- a/dev-libs/osformat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST osformat-1.0.7.tar.xz 248112 SHA512 21dbb20674593623af205a83552c5519a43b4a15ae49ee526c3703d86d80c06c9aa66054736e262b3ddbbdce0de62654ee3758dbc86c26177c82b914b5262064
diff --git a/dev-libs/osformat/metadata.xml b/dev-libs/osformat/metadata.xml
deleted file mode 100644
index d9944a43..00000000
--- a/dev-libs/osformat/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <bugs-to>mailto:martin@mvath.de</bugs-to>
- <remote-id type="github">vaeth/osformat</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-libs/osformat/osformat-1.0.7.ebuild b/dev-libs/osformat/osformat-1.0.7.ebuild
deleted file mode 100644
index 72fb4bad..00000000
--- a/dev-libs/osformat/osformat-1.0.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2017-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-SRC_URI="https://github.com/vaeth/osformat/releases/download/v${PV}/${P}.tar.xz"
-
-DESCRIPTION="C++ library for a typesafe printf/sprintf based on << conversion"
-HOMEPAGE="https://github.com/vaeth/osformat/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/osformat/osformat-999999999.ebuild b/dev-libs/osformat/osformat-999999999.ebuild
deleted file mode 100644
index efc9b670..00000000
--- a/dev-libs/osformat/osformat-999999999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2017-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-case ${PV} in
-99999999*)
- EGIT_REPO_URI="https://github.com/vaeth/${PN}.git"
- inherit git-r3
- SRC_URI=""
- PROPERTIES="live";;
-*)
- RESTRICT="mirror"
- EGIT_COMMIT="7ea6497698b11fa3289b223b2e2d487500dcaa10"
- SRC_URI="https://github.com/vaeth/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
-esac
-
-DESCRIPTION="C++ library for a typesafe printf/sprintf based on << conversion"
-HOMEPAGE="https://github.com/vaeth/osformat/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
deleted file mode 100644
index 9736cc91..00000000
--- a/dev-libs/weston/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST weston-5.0.0.tar.xz 1467496 SHA512 b6f97eca014ea47f3de0c5ddd89712f896cd66423d0eb499e1d88d35aab616cef1e735ebb8e0cefd8b60085314b6ec3d56b39d7c4776188bb56d58efc84a52cf
-DIST weston-8.0.0.tar.xz 1094904 SHA512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c
diff --git a/dev-libs/weston/files/README.gentoo b/dev-libs/weston/files/README.gentoo
deleted file mode 100644
index ed8c5c3b..00000000
--- a/dev-libs/weston/files/README.gentoo
+++ /dev/null
@@ -1,9 +0,0 @@
-For running Weston you need to have $XDG_RUNTIME_DIR in your environment,
-directory must exist and have correct permissions. If you are not using systemd,
-it will not be created automatically, you can create it using your shell,
-add these lines to ~/.bash_profile:
-
-# wayland
-export XDG_RUNTIME_DIR=/tmp/.runtime-${USER}
-mkdir -p "${XDG_RUNTIME_DIR}"
-chmod 0700 "${XDG_RUNTIME_DIR}"
diff --git a/dev-libs/weston/files/pam-6.0.93.patch b/dev-libs/weston/files/pam-6.0.93.patch
deleted file mode 100644
index 09528755..00000000
--- a/dev-libs/weston/files/pam-6.0.93.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-https://github.com/Freescale/meta-freescale/raw/master/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
-From 8ff6ed03ec4079f32e9b34085414e57be4730e04 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Wed, 22 Feb 2017 15:53:30 +0200
-Subject: [PATCH] weston-launch: Provide a default version that doesn't require
- PAM
-
-weston-launch requires PAM for starting weston as a non-root user.
-
-Since starting weston as root is a valid use case by itself, if
-PAM is not available, provide a default version of weston-launch
-without non-root-user support.
-
-Patch adapted by Martin Väth <mvath at google.com>
---- 1/libweston/weston-launch.c
-+++ 1/libweston/weston-launch.c
-@@ -51,7 +51,9 @@
-
- #include <pwd.h>
- #include <grp.h>
-+#ifdef HAVE_PAM
- #include <security/pam_appl.h>
-+#endif
-
- #ifdef HAVE_SYSTEMD_LOGIN
- #include <systemd/sd-login.h>
-@@ -100,8 +102,10 @@
- #endif
-
- struct weston_launch {
-+#ifdef HAVE_PAM
- struct pam_conv pc;
- pam_handle_t *ph;
-+#endif
- int tty;
- int ttynr;
- int sock[2];
-@@ -192,6 +196,7 @@
- return false;
- }
-
-+#ifdef HAVE_PAM
- static int
- pam_conversation_fn(int msg_count,
- const struct pam_message **messages,
-@@ -232,6 +237,7 @@
-
- return 0;
- }
-+#endif
-
- static int
- setup_launcher_socket(struct weston_launch *wl)
-@@ -431,6 +437,7 @@
- close(wl->signalfd);
- close(wl->sock[0]);
-
-+#ifdef HAVE_PAM
- if (wl->new_user) {
- err = pam_close_session(wl->ph, 0);
- if (err)
-@@ -438,6 +445,7 @@
- err, pam_strerror(wl->ph, err));
- pam_end(wl->ph, err);
- }
-+#endif
-
- if (ioctl(wl->tty, KDSKBMUTE, 0) &&
- ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
-@@ -660,6 +668,7 @@
- setenv("HOME", wl->pw->pw_dir, 1);
- setenv("SHELL", wl->pw->pw_shell, 1);
-
-+#ifdef HAVE_PAM
- env = pam_getenvlist(wl->ph);
- if (env) {
- for (i = 0; env[i]; ++i) {
-@@ -668,6 +677,7 @@
- }
- free(env);
- }
-+#endif
-
- /*
- * We open a new session, so it makes sense
-@@ -739,8 +749,10 @@
- help(const char *name)
- {
- fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
-+#ifdef HAVE_PAM
- fprintf(stderr, " -u, --user Start session as specified username,\n"
- " e.g. -u joe, requires root.\n");
-+#endif
- fprintf(stderr, " -t, --tty Start session on alternative tty,\n"
- " e.g. -t /dev/tty4, requires -u option.\n");
- fprintf(stderr, " -v, --verbose Be verbose\n");
-@@ -754,7 +766,9 @@
- int i, c;
- char *tty = NULL;
- struct option opts[] = {
-+#ifdef HAVE_PAM
- { "user", required_argument, NULL, 'u' },
-+#endif
- { "tty", required_argument, NULL, 't' },
- { "verbose", no_argument, NULL, 'v' },
- { "help", no_argument, NULL, 'h' },
-@@ -766,11 +780,15 @@
- while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
- switch (c) {
- case 'u':
-+#ifdef HAVE_PAM
- wl.new_user = optarg;
- if (getuid() != 0) {
- fprintf(stderr, "weston: Permission denied. -u allowed for root only\n");
- exit(EXIT_FAILURE);
- }
-+#else
-+ error(1, 0, "-u is unsupported in this weston-launch build");
-+#endif
- break;
- case 't':
- tty = optarg;
-@@ -822,8 +840,10 @@
- if (setup_tty(&wl, tty) < 0)
- exit(EXIT_FAILURE);
-
-+#ifdef HAVE_PAM
- if (wl.new_user && setup_pam(&wl) < 0)
- exit(EXIT_FAILURE);
-+#endif
-
- if (setup_launcher_socket(&wl) < 0)
- exit(EXIT_FAILURE);
diff --git a/dev-libs/weston/files/pam-meson.patch b/dev-libs/weston/files/pam-meson.patch
deleted file mode 100644
index 63c4549f..00000000
--- a/dev-libs/weston/files/pam-meson.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# Supplement to pam.patch for meson by Martin Väth <mvath at google.com>
---- 1/libweston/meson.build
-+++ 1/libweston/meson.build
-@@ -472,10 +472,14 @@
- endif
-
- if get_option('weston-launch')
-- dep_pam = cc.find_library('pam')
-+ dep_pam = systemd_dep
-+ if get_option('pam')
-+ config_h.set('HAVE_PAM', '1')
-+ dep_pam = cc.find_library('pam')
-
-- if not cc.has_function('pam_open_session', dependencies: dep_pam)
-- error('pam_open_session not found for weston-launch')
-+ if not cc.has_function('pam_open_session', dependencies: dep_pam)
-+ error('pam_open_session not found for weston-launch')
-+ endif
- endif
-
- executable(
---- 1/meson_options.txt
-+++ 1/meson_options.txt
-@@ -73,6 +73,13 @@
- )
-
- option(
-+ 'pam',
-+ type: 'boolean',
-+ value: true,
-+ description: 'Use pam for weston-launch'
-+)
-+
-+option(
- 'xwayland',
- type: 'boolean',
- value: true,
diff --git a/dev-libs/weston/files/pam.patch b/dev-libs/weston/files/pam.patch
deleted file mode 100644
index ea926f88..00000000
--- a/dev-libs/weston/files/pam.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-https://github.com/Freescale/meta-freescale/raw/master/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
-From 8ff6ed03ec4079f32e9b34085414e57be4730e04 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-Date: Wed, 22 Feb 2017 15:53:30 +0200
-Subject: [PATCH] weston-launch: Provide a default version that doesn't require
- PAM
-
-weston-launch requires PAM for starting weston as a non-root user.
-
-Since starting weston as root is a valid use case by itself, if
-PAM is not available, provide a default version of weston-launch
-without non-root-user support.
-
-Upstream-Status: Pending
-
-Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---- 1/configure.ac
-+++ 1/configure.ac
-@@ -468,13 +468,17 @@
- AS_IF([test "x$enable_resize_optimization" = "xyes"],
- [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
-
-+AC_ARG_WITH(pam,
-+ AS_HELP_STRING([--with-pam], [Use PAM]),
-+ [use_pam=$withval], [use_pam=yes])
- AC_ARG_ENABLE(weston-launch, [ --enable-weston-launch],, enable_weston_launch=yes)
- AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch = xyes)
--if test x$enable_weston_launch = xyes; then
-+if test x$enable_weston_launch = xyes && test x$use_pam = xyes; then
- WESTON_SEARCH_LIBS([PAM], [pam], [pam_open_session], [have_pam=yes], [have_pam=no])
- if test x$have_pam = xno; then
-- AC_ERROR([weston-launch requires pam])
-+ AC_ERROR([PAM support is explicitly requested, but libpam couldn't be found])
- fi
-+ AC_DEFINE([HAVE_PAM], [1], [Define if PAM is available])
- fi
-
- AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
-@@ -719,6 +723,7 @@
- Enable developer documentation ${enable_devdocs}
-
- weston-launch utility ${enable_weston_launch}
-+ PAM support ${use_pam}
- systemd-login support ${have_systemd_login}
- systemd notify support ${enable_systemd_notify}
-
---- 1/libweston/weston-launch.c
-+++ 1/libweston/weston-launch.c
-@@ -52,7 +52,9 @@
-
- #include <pwd.h>
- #include <grp.h>
-+#ifdef HAVE_PAM
- #include <security/pam_appl.h>
-+#endif
-
- #ifdef HAVE_SYSTEMD_LOGIN
- #include <systemd/sd-login.h>
-@@ -101,8 +103,10 @@
- #endif
-
- struct weston_launch {
-+#ifdef HAVE_PAM
- struct pam_conv pc;
- pam_handle_t *ph;
-+#endif
- int tty;
- int ttynr;
- int sock[2];
-@@ -191,6 +195,7 @@
- return false;
- }
-
-+#ifdef HAVE_PAM
- static int
- pam_conversation_fn(int msg_count,
- const struct pam_message **messages,
-@@ -231,6 +236,7 @@
-
- return 0;
- }
-+#endif
-
- static int
- setup_launcher_socket(struct weston_launch *wl)
-@@ -424,6 +430,7 @@
- close(wl->signalfd);
- close(wl->sock[0]);
-
-+#ifdef HAVE_PAM
- if (wl->new_user) {
- err = pam_close_session(wl->ph, 0);
- if (err)
-@@ -431,6 +438,7 @@
- err, pam_strerror(wl->ph, err));
- pam_end(wl->ph, err);
- }
-+#endif
-
- if (ioctl(wl->tty, KDSKBMUTE, 0) &&
- ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
-@@ -610,6 +618,7 @@
- setenv("HOME", wl->pw->pw_dir, 1);
- setenv("SHELL", wl->pw->pw_shell, 1);
-
-+#ifdef HAVE_PAM
- env = pam_getenvlist(wl->ph);
- if (env) {
- for (i = 0; env[i]; ++i) {
-@@ -618,6 +627,7 @@
- }
- free(env);
- }
-+#endif
-
- /*
- * We open a new session, so it makes sense
-@@ -685,8 +695,10 @@
- help(const char *name)
- {
- fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
-+#ifdef HAVE_PAM
- fprintf(stderr, " -u, --user Start session as specified username,\n"
- " e.g. -u joe, requires root.\n");
-+#endif
- fprintf(stderr, " -t, --tty Start session on alternative tty,\n"
- " e.g. -t /dev/tty4, requires -u option.\n");
- fprintf(stderr, " -v, --verbose Be verbose\n");
-@@ -700,7 +712,9 @@
- int i, c;
- char *tty = NULL;
- struct option opts[] = {
-+#ifdef HAVE_PAM
- { "user", required_argument, NULL, 'u' },
-+#endif
- { "tty", required_argument, NULL, 't' },
- { "verbose", no_argument, NULL, 'v' },
- { "help", no_argument, NULL, 'h' },
-@@ -712,9 +726,13 @@
- while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
- switch (c) {
- case 'u':
-+#ifdef HAVE_PAM
- wl.new_user = optarg;
- if (getuid() != 0)
- error(1, 0, "Permission denied. -u allowed for root only");
-+#else
-+ error(1, 0, "-u is unsupported in this weston-launch build");
-+#endif
- break;
- case 't':
- tty = optarg;
-@@ -755,8 +773,10 @@
- if (setup_tty(&wl, tty) < 0)
- exit(EXIT_FAILURE);
-
-+#ifdef HAVE_PAM
- if (wl.new_user && setup_pam(&wl) < 0)
- exit(EXIT_FAILURE);
-+#endif
-
- if (setup_launcher_socket(&wl) < 0)
- exit(EXIT_FAILURE);
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
deleted file mode 100644
index 661f699a..00000000
--- a/dev-libs/weston/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>x11@gentoo.org</email>
- <name>X11</name>
-</maintainer>
-<use>
- <flag name="colord">Allow setting color managment</flag>
- <flag name="drm">Enable drm compositor support</flag>
- <flag name="editor">Install wayland-editor example application</flag>
- <flag name="fbdev">Enable fbdev compositor support</flag>
- <flag name="gles2">Use GLESv2 cairo instead of full GL</flag>
- <flag name="headless">Headless backend and a noop renderer, mainly for testing purposes</flag>
- <flag name="ivi">Enable the IVI shell</flag>
- <flag name="launch">Install weston-launch utility</flag>
- <flag name="rdp">Enable Remote Desktop Protocol compositor support</flag>
- <flag name="resize-optimization">Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag>
- <flag name="screen-sharing">Enable screen-sharing through RDP</flag>
- <flag name="unwind">Enable libunwind usage for backtraces</flag>
- <flag name="wayland-compositor">Enable Wayland compositor support</flag>
- <flag name="webp">Add support for the WebP image format</flag>
- <flag name="xwayland">Enable ability support native X11 applications</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-libs/weston/weston-5.0.0-r1.ebuild b/dev-libs/weston/weston-5.0.0-r1.ebuild
deleted file mode 100644
index 14db5669..00000000
--- a/dev-libs/weston/weston-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git"
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-inherit autotools readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
- SRC_URI="${SRC_PATCHES}"
- KEYWORDS=""
-else
- SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms pam rdp +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
-
-REQUIRED_USE="
- drm? ( gles2 )
- screen-sharing? ( rdp )
- systemd? ( dbus )
- test? ( headless xwayland )
- wayland-compositor? ( gles2 )
-"
-
-RDEPEND="
- >=dev-libs/libinput-0.8.0
- >=dev-libs/wayland-1.12.0
- >=dev-libs/wayland-protocols-1.13
- lcms? ( media-libs/lcms:2 )
- media-libs/libpng:0=
- webp? ( media-libs/libwebp:0= )
- jpeg? ( virtual/jpeg:0= )
- >=x11-libs/cairo-1.11.3
- >=x11-libs/libdrm-2.4.68
- >=x11-libs/libxkbcommon-0.5.0
- >=x11-libs/pixman-0.25.2
- x11-misc/xkeyboard-config
- fbdev? (
- >=sys-libs/mtdev-1.1.0
- >=virtual/udev-136
- )
- colord? ( >=x11-misc/colord-0.1.27 )
- dbus? ( >=sys-apps/dbus-1.6 )
- drm? (
- >=media-libs/mesa-17.1[gbm]
- >=sys-libs/mtdev-1.1.0
- >=virtual/udev-136
- )
- editor? ( x11-libs/pango )
- gles2? (
- media-libs/mesa[gles2,wayland]
- )
- rdp? ( >=net-misc/freerdp-1.1.0:= )
- systemd? (
- pam? ( sys-auth/pambase[systemd] )
- >=sys-apps/systemd-209[pam?]
- )
- launch? ( pam? ( sys-auth/pambase ) )
- X? (
- >=x11-libs/libxcb-1.9
- x11-libs/libX11
- )
- xwayland? (
- x11-base/xorg-server[wayland]
- x11-libs/cairo[xcb]
- >=x11-libs/libxcb-1.9
- x11-libs/libXcursor
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
- eapply "${FILESDIR}"/pam.patch
- default
- eautoreconf
-}
-
-src_configure() {
- local myconf=()
-
- if use examples || use test; then
- myconf+=( --enable-simple-clients )
- else
- myconf+=( --disable-simple-clients )
- fi
-
- econf \
- $(use_enable examples demo-clients-install) \
- $(use_enable fbdev fbdev-compositor) \
- $(use_enable dbus) \
- $(use_enable drm drm-compositor) \
- $(use_enable headless headless-compositor) \
- $(use_enable ivi ivi-shell) \
- $(use_enable lcms) \
- $(use_enable rdp rdp-compositor) \
- $(use_enable wayland-compositor) \
- $(use_enable X x11-compositor) \
- $(use_enable launch weston-launch) \
- $(use_enable colord) \
- $(use_enable gles2 egl) \
- $(use_enable resize-optimization) \
- $(use_enable screen-sharing) \
- $(use_enable suid setuid-install) \
- $(use_enable systemd systemd-login) \
- $(use_enable systemd systemd-notify) \
- $(use_enable xwayland) \
- $(use_enable xwayland xwayland-test) \
- $(use_with jpeg) \
- $(use_with pam) \
- $(use_with webp) \
- --with-cairo=image \
- --disable-junit-xml \
- --disable-simple-dmabuf-drm-client \
- --disable-simple-dmabuf-v4l-client \
- --disable-simple-egl-clients \
- --disable-vaapi-recorder \
- "${myconf[@]}"
-}
-
-src_test() {
- export XDG_RUNTIME_DIR="${T}/runtime-dir"
- mkdir "${XDG_RUNTIME_DIR}" || die
- chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
- cd "${BUILD_DIR}" || die
- emake check
-}
-
-src_install() {
- default
-
- readme.gentoo_create_doc
-}
diff --git a/dev-libs/weston/weston-8.0.0.ebuild b/dev-libs/weston/weston-8.0.0.ebuild
deleted file mode 100644
index 755eb450..00000000
--- a/dev-libs/weston/weston-8.0.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
-
-if [[ $PV = 9999* ]]; then
- SRC_URI="${SRC_PATCHES}"
- KEYWORDS=""
-else
- SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms pam pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- colord? ( lcms )
- drm? ( gles2 )
- pipewire? ( drm )
- screen-sharing? ( rdp )
- test? ( desktop headless xwayland )
- wayland-compositor? ( gles2 )
- || ( drm fbdev headless rdp wayland-compositor X )
-"
-
-RDEPEND="
- >=dev-libs/libinput-0.8.0
- >=dev-libs/wayland-1.17.0
- >=dev-libs/wayland-protocols-1.18
- lcms? ( media-libs/lcms:2 )
- media-libs/libpng:0=
- webp? ( media-libs/libwebp:0= )
- jpeg? ( virtual/jpeg:0= )
- >=x11-libs/cairo-1.11.3
- >=x11-libs/libdrm-2.4.68
- >=x11-libs/libxkbcommon-0.5.0
- >=x11-libs/pixman-0.25.2
- x11-misc/xkeyboard-config
- fbdev? (
- >=sys-libs/mtdev-1.1.0
- >=virtual/udev-136
- )
- colord? ( >=x11-misc/colord-0.1.27 )
- drm? (
- >=media-libs/mesa-17.1[gbm]
- >=sys-libs/mtdev-1.1.0
- >=virtual/udev-136
- )
- editor? ( x11-libs/pango )
- gles2? (
- media-libs/mesa[gles2,wayland]
- )
- pipewire? ( >=media-video/pipewire-0.2 )
- rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
- remoting? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- systemd? (
- pam? ( sys-auth/pambase[systemd] )
- >=sys-apps/dbus-1.6
- >=sys-apps/systemd-209[pam?]
- )
- launch? ( pam? ( sys-auth/pambase ) )
- X? (
- >=x11-libs/libxcb-1.9
- x11-libs/libX11
- )
- xwayland? (
- x11-base/xorg-server[wayland]
- x11-libs/cairo[X,xcb(+)]
- >=x11-libs/libxcb-1.9
- x11-libs/libXcursor
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
-"
-
-src_prepare() {
- eapply "${FILESDIR}"/pam-6.0.93.patch
- eapply "${FILESDIR}"/pam-meson.patch
- default
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use drm backend-drm)
- -Dbackend-drm-screencast-vaapi=false
- $(meson_use headless backend-headless)
- $(meson_use rdp backend-rdp)
- $(meson_use screen-sharing screenshare)
- $(meson_use wayland-compositor backend-wayland)
- $(meson_use X backend-x11)
- $(meson_use fbdev backend-fbdev)
- -Dbackend-default=auto
- $(meson_use gles2 renderer-gl)
- $(meson_use launch weston-launch)
- $(meson_use pam)
- $(meson_use xwayland)
- $(meson_use systemd)
- $(meson_use remoting)
- $(meson_use pipewire)
- $(meson_use desktop shell-desktop)
- $(meson_use fullscreen shell-fullscreen)
- $(meson_use ivi shell-ivi)
- $(meson_use lcms color-management-lcms)
- $(meson_use colord color-management-colord)
- $(meson_use systemd launcher-logind)
- $(meson_use jpeg image-jpeg)
- $(meson_use webp image-webp)
- -Dtools=debug,info,terminal
- -Dsimple-dmabuf-drm=auto
- $(meson_use examples demo-clients)
- -Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
- $(meson_use resize-optimization resize-pool)
- -Dtest-junit-xml=false
- "${myconf[@]}"
- )
- meson_src_configure
-}
-
-src_test() {
- xdg_environment_reset
-
- # devices test usually fails.
- cd "${BUILD_DIR}" || die
- meson test $(meson test --list | grep -Fxv devices) || die
-}
-
-src_install() {
- meson_src_install
- if use launch && use suid; then
- chmod u+s "${ED}"/usr/bin/weston-launch || die
- fi
- readme.gentoo_create_doc
-}
diff --git a/dev-perl/File-lchown/ChangeLog b/dev-perl/File-lchown/ChangeLog
new file mode 100644
index 00000000..25e610ce
--- /dev/null
+++ b/dev-perl/File-lchown/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for dev-perl/File-lchown
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*File-lchown-0.2 (21 Sep 2014)
+
+ 14 Jun 2015; Martin Väth <martin@mvaeth.de>:
+ Version bump to fix renaming of Module-Build
+
+ 24 Sep 2014; Martin Väth <martin@mvaeth.de>:
+ Add ~ARCH which probably work, even if untested
+
+ 21 Sep 2014; Martin Väth <martin@mvaeth.de>:
+ New ebuild from scratch
diff --git a/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild b/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild
index 51bab842..a79c25d3 100644
--- a/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild
+++ b/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 2014-2019 Gentoo Authors
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=6
+EAPI=5
RESTRICT="mirror"
-DIST_AUTHOR=PEVANS
-DIST_VERSION=0.02
+MODULE_AUTHOR=PEVANS
+MODULE_VERSION=0.02
inherit perl-module
DESCRIPTION="Use the lchown(2) and lutimes(2) system call from Perl"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/File-lchown/Manifest b/dev-perl/File-lchown/Manifest
index f7c6878a..5d63218e 100644
--- a/dev-perl/File-lchown/Manifest
+++ b/dev-perl/File-lchown/Manifest
@@ -1 +1 @@
-DIST File-lchown-0.02.tar.gz 11821 SHA512 0673176423465cd18d41708977216a3785e4d6204928472499be25be3f86f376646dc2636406855ae75a0bfbce26bc36d2fbf410950febc2978b4c6d5fb99922
+DIST File-lchown-0.02.tar.gz 11821 SHA256 a02fbf285406a8a4d9399284f032f2d55c56975154c2e1674bd109837b8096ec SHA512 0673176423465cd18d41708977216a3785e4d6204928472499be25be3f86f376646dc2636406855ae75a0bfbce26bc36d2fbf410950febc2978b4c6d5fb99922 WHIRLPOOL 7a78c507c527b2caa667edf536f4f56d3419d00a41a3404b372ec262b4419114f31291fa0d0ec6453e937821fdc9fdbda40cfc5a3e4968c33bd18e13ee196b79
diff --git a/dev-perl/File-lchown/metadata.xml b/dev-perl/File-lchown/metadata.xml
index b9ee7387..ab3ee0c6 100644
--- a/dev-perl/File-lchown/metadata.xml
+++ b/dev-perl/File-lchown/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
<upstream>
<remote-id type="cpan">File-lchown</remote-id>
<remote-id type="cpan-module">File::lchown</remote-id>
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
deleted file mode 100644
index a2e76ee6..00000000
--- a/dev-python/PyPDF2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PyPDF2-1.26.0.tar.gz 77556 SHA512 7b427f1d099dcd687a718fb8d86e6f677ad45257414c6367e4dfacd8dfef7e3dbe3816027359868764981f36a30721f1731b4c23cbe2f35cfab1c64fb290b034
diff --git a/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild b/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
deleted file mode 100644
index 491d56c8..00000000
--- a/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with pdf files"
-HOMEPAGE="https://pypi.org/project/${PN}/ https://github.com/mstamy2/PyPDF2"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-PATCHES=( "${FILESDIR}/${P}-py3-tests.patch" )
-
-python_test() {
- "${EPYTHON}" -m unittest Tests.tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- if use examples; then
- docinto examples
- dodoc -r Sample_Code/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
- distutils-r1_python_install_all
-}
diff --git a/dev-python/PyPDF2/files/PyPDF2-1.26.0-py3-tests.patch b/dev-python/PyPDF2/files/PyPDF2-1.26.0-py3-tests.patch
deleted file mode 100644
index c74491b9..00000000
--- a/dev-python/PyPDF2/files/PyPDF2-1.26.0-py3-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6b46d03ee3a5bd5c2c18fae8aec8a0020ee68add Mon Sep 17 00:00:00 2001
-From: Venelin Stoykov <vkstoykov@gmail.com>
-Date: Sat, 26 Dec 2015 17:26:00 +0200
-Subject: [PATCH 2/3] Fix tests for Python 3
-
----
- Tests/tests.py | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/Tests/tests.py b/Tests/tests.py
-index fa93c10..83b5951 100644
---- a/Tests/tests.py
-+++ b/Tests/tests.py
-@@ -27,14 +27,15 @@ def test_PdfReaderFileLoad(self):
- ipdf_p1 = ipdf.getPage(0)
-
- # Retrieve the text of the PDF
-- pdftext_file = open(os.path.join(RESOURCE_ROOT, 'crazyones.txt'), 'r')
-- pdftext = pdftext_file.read()
-- ipdf_p1_text = ipdf_p1.extractText().replace('\n', '')
-+ with open(os.path.join(RESOURCE_ROOT, 'crazyones.txt'), 'rb') as pdftext_file:
-+ pdftext = pdftext_file.read()
-+
-+ ipdf_p1_text = ipdf_p1.extractText().replace('\n', '').encode('utf-8')
-
- # Compare the text of the PDF to a known source
-- self.assertEqual(ipdf_p1_text.encode('utf-8', errors='ignore'), pdftext,
-+ self.assertEqual(ipdf_p1_text, pdftext,
- msg='PDF extracted text differs from expected value.\n\nExpected:\n\n%r\n\nExtracted:\n\n%r\n\n'
-- % (pdftext, ipdf_p1_text.encode('utf-8', errors='ignore')))
-+ % (pdftext, ipdf_p1_text))
-
-
- class AddJsTestCase(unittest.TestCase):
-
diff --git a/dev-python/PyPDF2/metadata.xml b/dev-python/PyPDF2/metadata.xml
deleted file mode 100644
index ad27f68c..00000000
--- a/dev-python/PyPDF2/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>python@gentoo.org</email>
- <name>Python</name>
- </maintainer>
- <upstream>
- <remote-id type="pypi">PyPDF2</remote-id>
- <remote-id type="github">mstamy2/PyPDF2</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-tex/chklref/ChangeLog b/dev-tex/chklref/ChangeLog
new file mode 100644
index 00000000..1677e96b
--- /dev/null
+++ b/dev-tex/chklref/ChangeLog
@@ -0,0 +1,58 @@
+# ChangeLog for dev-tex/chkltex
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*chkltex-2.6.0 (31 Dec 2014)
+
+ 31 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*chkltex-2.5.2 (23 Dec 2014)
+
+ 23 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*chkltex-2.5.1-r1 (14 Aug 2013)
+
+ 14 Aug 2013; Martin Väth <martin@mvath.de>:
+ Change install path to comply with texlive-2013
+
+*chkltex-2.5.1 (11 Apr 2011)
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 11 Apr 2011; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+*chkltex-2.5 (16 Aug 2010)
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 17 Aug 2010; Martin Väth <martin@mvath.de>:
+ Redigest. Removing POSIX patch since it was put into upstream tarball
+
+ 16 Aug 2010; Martin Väth <martin@mvath.de>:
+ Bump. Removing patch since it is now in upstream package :)
+ Cleanup ebuild since DISTDIR is now supported by upstream
+
+*chkltex-2.4 (23 Apr 2010)
+
+ 12 Aug 2010; Martin Väth <martin@mvath.de>:
+ Add a patch to find uncited bibliography entries
+
+ 27 Apr 2010; Martin Väth <martin@mvath.de>:
+ Use ${ED} in install phase
+
+ 24 Apr 2010; Martin Väth <martin@mvath.de>:
+ Add RESTRICT="mirror"
+
+ 23 Apr 2010; Martin Väth <martin@mvath.de>:
+ Build from scratch
diff --git a/dev-tex/chklref/Manifest b/dev-tex/chklref/Manifest
index caba3681..3b752b69 100644
--- a/dev-tex/chklref/Manifest
+++ b/dev-tex/chklref/Manifest
@@ -1,2 +1 @@
-DIST chklref-2.6.0.tar.gz 53484 SHA512 bb61334022eb50c2a31bcfcbd6528260da8e4027c34ea3a0cba8d12e93e07e9dc1a6aad6146b60c811914faae4ac2d47b570edce986849a59bf6aefd4eafe7dd
-DIST chklref-2.6.1_alpha20170913.tar.gz 53492 SHA512 b4fe6a0b99b04597a45321fd877f54e068adaefdaefb3b9fed7f3ceb90afbe8a7fa45f1cdbf0d1b3e2bbd769973ea6db095c168160d451aa11abe84e2eea839f
+DIST chklref-2.6.0.tar.gz 330048 SHA256 eeede59fdffe79f4123480b7f72e31264556474f208348db9ffd5b0aa613fc9a SHA512 30e15be050fb344575245dc8e52455e406457491ee4fd3da66d22ab2e21cefc51673936900a6bc91c2eb05440dc46a68bfb77e9fe6d1a3d0bc94febf83de4343 WHIRLPOOL 80f72d0f23cb1a6109552e772ba6e5ea83e689ab9559090bea7feb2fec01c54854d586281ec94ce333a0301660f6f1417ce82b562cc0a2f3762b0249b9814cdb
diff --git a/dev-tex/chklref/chklref-2.6.0.ebuild b/dev-tex/chklref/chklref-2.6.0.ebuild
index 5b16ff01..d2cbb04f 100644
--- a/dev-tex/chklref/chklref-2.6.0.ebuild
+++ b/dev-tex/chklref/chklref-2.6.0.ebuild
@@ -1,38 +1,29 @@
-# Copyright 2010-2018 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
-inherit latex-package
+EAPI=5
+inherit eutils latex-package
RESTRICT="mirror"
-DESCRIPTION="Finds useless references in latex files or unnecessarily numbered environments"
-HOMEPAGE="https://github.com/jlelong/chklref/"
-case ${PV} in
-*alpha*)
- EGIT_COMMIT="23028ecbeff38429d1e91a7e142d2bdc623298d8"
- SRC_URI="https://github.com/jlelong/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
-*)
- SRC_URI="https://github.com/jlelong/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz";;
-esac
+DESCRIPTION="Finds out useless references in latex files or numbered environments that should not be"
+HOMEPAGE="http://www-ljk.imag.fr/membres/Jerome.Lelong/soft/chklref/index.html"
+SRC_URI="http://www-ljk.imag.fr/membres/Jerome.Lelong/soft/chklref/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="virtual/latex-base
dev-lang/perl"
-BDEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-ver_test "${PV}" -gt 2.6.0 || DOCS=( README )
+DEPEND="${RDEPEND}"
src_prepare() {
use prefix || sed -i \
-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-- "${S}"/src/chklref.in || die
- default
+ epatch_user
}
src_configure() {
@@ -45,4 +36,5 @@ src_compile() {
src_install() {
default
+ dodoc README
}
diff --git a/dev-tex/chklref/chklref-2.6.1_alpha20170913.ebuild b/dev-tex/chklref/chklref-2.6.1_alpha20170913.ebuild
deleted file mode 100644
index 5b16ff01..00000000
--- a/dev-tex/chklref/chklref-2.6.1_alpha20170913.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2010-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit latex-package
-RESTRICT="mirror"
-
-DESCRIPTION="Finds useless references in latex files or unnecessarily numbered environments"
-HOMEPAGE="https://github.com/jlelong/chklref/"
-case ${PV} in
-*alpha*)
- EGIT_COMMIT="23028ecbeff38429d1e91a7e142d2bdc623298d8"
- SRC_URI="https://github.com/jlelong/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
-*)
- SRC_URI="https://github.com/jlelong/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz";;
-esac
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="virtual/latex-base
- dev-lang/perl"
-BDEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-ver_test "${PV}" -gt 2.6.0 || DOCS=( README )
-
-src_prepare() {
- use prefix || sed -i \
- -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
- -- "${S}"/src/chklref.in || die
- default
-}
-
-src_configure() {
- econf --with-texmf-prefix="${EPREFIX}${TEXMF}"
-}
-
-src_compile() {
- default
-}
-
-src_install() {
- default
-}
diff --git a/dev-tex/chklref/metadata.xml b/dev-tex/chklref/metadata.xml
index 86b1deb4..472e8676 100644
--- a/dev-tex/chklref/metadata.xml
+++ b/dev-tex/chklref/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog
new file mode 100644
index 00000000..12a3307f
--- /dev/null
+++ b/dev-util/ccache/ChangeLog
@@ -0,0 +1,24 @@
+# ChangeLog for dev-util/ccache
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 23 Dec 2014; Martin Väth <martin@mvath.de>:
+ Bump ebuild from tree
+
+ 20 Nov 2014; Martin Väth <martin@mvath.de>:
+ Update ebuild from tree
+
+ 03 Nov 2013; Martin Väth <martin@mvath.de>:
+ Update ebuild from tree. Do not produce broken icc, clang links
+
+ 07 Oct 2013; Martin Väth <martin@mvath.de>:
+ Add latest changes from the Gentoo tree (support also icc, fix tests)
+
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Bump to git-r3.eclass
+
+ 24 Aug 2013; Martin Väth <martin@mvath.de>:
+ Bump to git-2.eclass
+
+ 13 Jul 2013; Martin Väth <martin@mvath.de>:
+ Add live ebuild. Remove previous history
diff --git a/dev-util/ccache/ccache-99999999-r3.ebuild b/dev-util/ccache/ccache-99999999-r3.ebuild
new file mode 100644
index 00000000..0d9fed91
--- /dev/null
+++ b/dev-util/ccache/ccache-99999999-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WANT_LIBTOOL=none
+EGIT_REPO_URI="git://git.samba.org/ccache.git"
+inherit autotools eutils git-r3 readme.gentoo
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="http://ccache.samba.org/"
+
+SRC_URI=""
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+ sys-libs/zlib"
+RDEPEND="${DEPEND}
+ sys-apps/gentoo-functions"
+
+src_prepare() {
+ # make sure we always use system zlib
+ rm -rf zlib || die
+ epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609
+ epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178
+ sed \
+ -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+ "${FILESDIR}"/ccache-config-3 > ccache-config || die
+ epatch_user
+ eautoreconf
+}
+
+src_install() {
+ DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.txt )
+ default
+
+ dobin ccache-config
+
+ DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+'${EPREFIX}/usr/lib/ccache/bin' to the beginning of your path, before '${EPREFIX}/usr/bin'.
+Portage 2.0.46-r11+ will automatically take advantage of ccache with
+no additional steps. If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:
+# ccache -M 2G
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+ readme.gentoo_create_doc
+}
+
+pkg_prerm() {
+ if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ "${EROOT}"/usr/bin/ccache-config --remove-links
+ "${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
+ fi
+}
+
+pkg_postinst() {
+ "${EROOT}"/usr/bin/ccache-config --install-links
+ "${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
+
+ # nuke broken symlinks from previous versions that shouldn't exist
+ rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die
+ rm -rf "${EROOT}"/usr/lib/ccache.backup || die
+
+ readme.gentoo_print_elog
+}
diff --git a/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch b/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch
new file mode 100644
index 00000000..5e502912
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/56178
+
+stick to the size of files on disk rather than their byte size.
+this func is only used for stats management, so this should be safe.
+
+--- a/util.c
++++ b/util.c
+@@ -845,12 +845,7 @@ file_size(struct stat *st)
+ #ifdef _WIN32
+ return (st->st_size + 1023) & ~1023;
+ #else
+- size_t size = st->st_blocks * 512;
+- if ((size_t)st->st_size > size) {
+- /* probably a broken stat() call ... */
+- size = (st->st_size + 1023) & ~1023;
+- }
+- return size;
++ return st->st_blocks * 512;
+ #endif
+ }
+
diff --git a/dev-util/ccache/files/ccache-3.1.7-no-perl.patch b/dev-util/ccache/files/ccache-3.1.7-no-perl.patch
new file mode 100644
index 00000000..5abd15e1
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.1.7-no-perl.patch
@@ -0,0 +1,15 @@
+avoid weak perl usage in tests
+
+https://bugs.gentoo.org/421609
+
+--- a/test.sh
++++ b/test.sh
+@@ -1466,7 +1466,7 @@
+ mkdir -p $dir
+ i=0
+ while [ $i -lt 10 ]; do
+- perl -e 'print "A" x 4017' >$dir/result$i-4017.o
++ printf '%4017s' '' | tr ' ' 'A' >$dir/result$i-4017.o
+ touch $dir/result$i-4017.stderr
+ touch $dir/result$i-4017.d
+ if [ $i -gt 5 ]; then
diff --git a/dev-util/ccache/files/ccache-config-3 b/dev-util/ccache/files/ccache-config-3
new file mode 100644
index 00000000..7f604f00
--- /dev/null
+++ b/dev-util/ccache/files/ccache-config-3
@@ -0,0 +1,97 @@
+#!/bin/sh
+#
+# ccache-config - helper script for ccache and its ebuild
+#
+# Copyright 2003-2014 Superlucidity Services, LLC
+# Copyright 2013-2014 Gentoo Foundation
+# This program licensed under the GNU GPL version 2.
+#
+# This script developed by Zachary T Welch at Superlucidity Services, LLC
+# it was cloned from the distcc-config script
+#
+# Additional features to come; this provides a starting point
+
+EPREFIX=''
+
+. "${EPREFIX}"/lib/gentoo/functions.sh 2>/dev/null || {
+ ebegin() { echo " * $* ..."; }
+ eend() {
+ local r=${1:-$?}
+ [ ${r} -eq 0 ] && echo " [ OK ]" || echo " [ !! ]"
+ return $r
+ }
+}
+
+LIBDIR="lib"
+
+# this should be getopt'd someday (override with CC_QUIET=1)
+CC_VERBOSE=1
+unset _CC_QUIET
+c_quiet() {
+ [ -n "${CC_QUIET:-${_CC_QUIET}}" ] || [ -z "${CC_VERBOSE}" ]
+}
+
+c_ebegin() { c_quiet || ebegin "$@" ; }
+c_eend() { c_quiet || eend "$@" ; }
+
+###
+# the following functions manage the ccache symlinks
+# they allow the user or other scripts (namely gcc-config) to
+# automatically update ccache's links when upgrading toolchains
+#
+cc_path() {
+ echo ${ROOT%/}${EPREFIX}/usr/${LIBDIR}/ccache/bin/$1
+}
+cc_remove_link() {
+ local t=$(cc_path "$1")
+ if [ -L ${t} ]; then
+ c_ebegin "Removing ${t}"
+ rm -f "${t}"
+ c_eend
+
+ # Trim the empty dir if possible. #517242
+ t=${t%/*}
+ if rmdir "${t}" 2>/dev/null; then
+ rmdir "${t%/*}" 2>/dev/null
+ fi
+ :
+ fi
+}
+cc_install_link() {
+ # Search the PATH for the specified compiler
+ # then create shadow link in /usr/lib/ccache/bin to ccache
+
+ if command -v "$1" >/dev/null ; then
+ # first be sure any old link is removed
+ _CC_QUIET=1
+ cc_remove_link "$1"
+ unset _CC_QUIET
+
+ # then create the new link
+ local t=$(cc_path "$1")
+ c_ebegin "Creating ccache shadow link ${t}"
+ mkdir -p -m 0755 "${t%/*}" && ln -s "${EPREFIX}"/usr/bin/ccache "${t}"
+ c_eend
+ fi
+}
+cc_links() {
+ local a
+ for a in gcc cc c++ g++ icc icpc clang clang++ ; do
+ "cc_${1}_link" "${2}${2:+-}${a}"
+ done
+}
+
+###
+# main routine
+
+case $1 in
+ --install-links )
+ cc_links install "$2"
+ ;;
+ --remove-links )
+ cc_links remove "$2"
+ ;;
+ * )
+ echo "usage: $0 {--install-links|--remove-links} [ CHOST ]"
+ ;;
+esac
diff --git a/dev-util/ccache/metadata.xml b/dev-util/ccache/metadata.xml
new file mode 100644
index 00000000..21bd7702
--- /dev/null
+++ b/dev-util/ccache/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>toolchain</herd>
+ <maintainer>
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <longdescription lang="en">
+ ccache acts as a caching pre-processor to C/C++ compilers, improving
+ compilation time when recompiling previously compiled source.
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-util/comp/Manifest b/dev-util/comp/Manifest
deleted file mode 100644
index b4d7f544..00000000
--- a/dev-util/comp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST comp-4.3.1.tar.gz 8434 SHA512 1c9dc56afa5c22933af05ced8021f1fd37162c1623d9b05d634e0f74f1555e7cb66d932e531dade56090610ae325ba139ccf90ab3449f1f1102e1fc15f2dd23b
diff --git a/dev-util/comp/comp-4.3.1.ebuild b/dev-util/comp/comp-4.3.1.ebuild
deleted file mode 100644
index 4adc1680..00000000
--- a/dev-util/comp/comp-4.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2016-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="compare files or directories, including metadata"
-HOMEPAGE="https://github.com/vaeth/comp/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# This should really depend on a USE-flag but must not by policy.
-# Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283
-OPTIONAL_RDEPEND="dev-perl/String-ShellQuote"
-
-RDEPEND="!<dev-util/mv_perl-3
->=dev-lang/perl-5.8
-${OPTIONAL_RDEPEND}"
-# || ( >=dev-lang/perl-5.9.4 >=virtual/perl-File-Spec-3.0 )
-# || ( >=dev-lang/perl-5.6.1 >=virtual/perl-Getopt-Long-2.24 )
-
-src_prepare() {
- use prefix || sed -i \
- -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
- -- bin/* || die
- default
-}
-
-src_install() {
- dobin bin/*
- dodoc README.md
- insinto /usr/share/zsh/site-functions
- doins zsh/_*
-}
diff --git a/dev-util/comp/metadata.xml b/dev-util/comp/metadata.xml
deleted file mode 100644
index d72cd2a5..00000000
--- a/dev-util/comp/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <bugs-to>mailto:martin@mvath.de</bugs-to>
- <remote-id type="github">vaeth/comp</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-util/diffhelp/ChangeLog b/dev-util/diffhelp/ChangeLog
new file mode 100644
index 00000000..f230c32d
--- /dev/null
+++ b/dev-util/diffhelp/ChangeLog
@@ -0,0 +1,76 @@
+# ChangeLog for dev-util/diffhelp
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*diffhelp-1.9 (12 Jul 2015)
+
+ 12 Jul 2016; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*diffhelp-1.8 (16 Jun 2015)
+
+ 16 Jun 2016; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*diffhelp-1.7 (17 Dec 2013)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix sh path
+
+*diffhelp-1.7 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*diffhelp-1.6-r1 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Shebang care
+
+*diffhelp-1.6 (09 Oct 2013)
+
+ 09 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*diffhelp-1.5 (07 May 2012)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*diffhelp-1.4 (08 Apr 2012)
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 08 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*diffhelp-1.3 (01 Mar 2012)
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 01 Mar 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fixes option parsing broken previously
+
+*diffhelp-1.2 (28 Feb 2012)
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*diffhelp-1.1 (04 Feb 2012)
+
+ 04 Feb 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/dev-util/diffhelp/Manifest b/dev-util/diffhelp/Manifest
index fb020b5d..86306f98 100644
--- a/dev-util/diffhelp/Manifest
+++ b/dev-util/diffhelp/Manifest
@@ -1 +1 @@
-DIST diffhelp-1.12.tar.gz 2372 SHA512 ddbd919c9c3f5b8c9d599fc2a94350ee1a6c54e23f908018923cfb922eba70bf319696ad5c3a6e1839c2c0eee358921ea8d84fea26969a336ad674ec0930bca6
+DIST diffhelp-1.9.tar.gz 1974 SHA256 b01883002d797c3d9d7e1268b66e24ef36e02642339151c3ad05645da5b69a06 SHA512 ea2ffa07041a28545facd6a626ab49c1853f2e32e64f05ba52cbb7afe8243f60474c48f46b853e99008d20fc4bebea70ee6516bfc794a9c601b786fa006dd0d1 WHIRLPOOL af924437aef7f58282606ed294c45d526fb7022f500cae9eb3acb9e589c7499b5a49ccff62f18f10548c4e3f70b95bbc13f0f5d67d18aa09aef06f322be38812
diff --git a/dev-util/diffhelp/diffhelp-1.12.ebuild b/dev-util/diffhelp/diffhelp-1.9.ebuild
index 64096664..f3539c9c 100644
--- a/dev-util/diffhelp/diffhelp-1.12.ebuild
+++ b/dev-util/diffhelp/diffhelp-1.9.ebuild
@@ -1,8 +1,10 @@
-# Copyright 2012-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
+inherit eutils
DESCRIPTION="A frontend, beautifier, and path-fixer for diff -u"
HOMEPAGE="https://github.com/vaeth/diffhelp/"
@@ -10,18 +12,18 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE=""
src_prepare() {
use prefix || sed -i \
-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
- -- bin/* || die
- default
+ -- "${PN}" || die
+ epatch_user
}
src_install() {
- dobin bin/*
+ dobin "${PN}"
insinto /usr/share/zsh/site-functions
- doins zsh/*
+ doins "_${PN}"
}
diff --git a/dev-util/diffhelp/metadata.xml b/dev-util/diffhelp/metadata.xml
index ce75d3d1..a6ce60d0 100644
--- a/dev-util/diffhelp/metadata.xml
+++ b/dev-util/diffhelp/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/dev-util/mv_perl/ChangeLog b/dev-util/mv_perl/ChangeLog
new file mode 100644
index 00000000..f1c37cc5
--- /dev/null
+++ b/dev-util/mv_perl/ChangeLog
@@ -0,0 +1,144 @@
+# ChangeLog for dev-util/mv_perl
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*mv_perl-2.49 (12 Sep 2015)
+
+ 12 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.48 (01 Aug 2015)
+
+ 01 Aug 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.47 (12 Jul 2015)
+
+ 12 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix "follow"
+
+*mv_perl-2.46 (17 Mar 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Simplify tarball name
+
+ 17 Mar 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.45 (14 Nov 2014)
+
+ 14 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.44 (11 Nov 2014)
+
+ 11 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.43 (01 Oct 2014)
+
+ 01 Oct 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.42 (30 Sep 2014)
+
+ 30 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.41 (21 Sep 2014)
+
+ 21 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support File-lchown for lutimes
+
+*mv_perl-2.40 (20 Sep 2014)
+
+ 20 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.37 (13 Sep 2014)
+
+ 13 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. More precise perl deps
+
+*mv_perl-2.35 (03 Sep 2014)
+
+ 03 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.34 (30 Aug 2014)
+
+ 30 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix touchdirs -r, finally
+
+*mv_perl-2.33 (25 Aug 2014)
+
+ 25 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix sshconfig regressions
+
+*mv_perl-2.32 (10 Aug 2014)
+
+ 10 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.31 (17 Jul 2014)
+
+ 17 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.29 (16 Jul 2014)
+
+ 16 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.28 (15 Jul 2014)
+
+ 15 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.27 (14 Jun 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 14 Jun 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.26 (05 Jun 2014)
+
+ 05 Jun 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.25 (25 May 2014)
+
+ 25 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.24 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.23 (11 Nov 2013)
+
+ 11 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.22 (24 Oct 2013)
+
+ 24 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.20 (22 Oct 2013)
+
+ 22 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.19 (20 Oct 2013)
+
+ 20 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*mv_perl-2.18 (19 Oct 2013)
+
+ 19 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Remove previous history
diff --git a/dev-util/mv_perl/Manifest b/dev-util/mv_perl/Manifest
index a3a813dc..bc96c0ae 100644
--- a/dev-util/mv_perl/Manifest
+++ b/dev-util/mv_perl/Manifest
@@ -1 +1 @@
-DIST mv_perl-4.2.tar.gz 73063 SHA512 e474647d079cdf3daba3257091a98a241724d08117a5469876a13b39386b17bc8769dea34892d42fb4cf6fc01258f9a867e4e798fcc61e35ddd77ad7d3078e2f
+DIST mv_perl-2.49.tar.gz 66965 SHA256 f3554df1ca22431c45e1942127ee1ee771b9ef4be4606a276f9a3b146bfc36d4 SHA512 911390eb995e4b881a2944608e9917d197f4d16e983b131d8523d460b73233a5a4d3f71d0df7f33382e9b022b1f812880619994e61071756d93ad362cd0ce8aa WHIRLPOOL a82576ef7c8c8884e7d6d3f429e569a5cd0ccb7b21d5374856f6d969c7a49f1361faeac58cee34c5dc759134de17abf9f97d44542e39293dc9f16f8c40ce34b7
diff --git a/dev-util/mv_perl/metadata.xml b/dev-util/mv_perl/metadata.xml
index 463de983..6b63165a 100644
--- a/dev-util/mv_perl/metadata.xml
+++ b/dev-util/mv_perl/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/dev-util/mv_perl/mv_perl-2.49.ebuild b/dev-util/mv_perl/mv_perl-2.49.ebuild
new file mode 100644
index 00000000..83f2adcd
--- /dev/null
+++ b/dev-util/mv_perl/mv_perl-2.49.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils
+
+DESCRIPTION="A collection of perl scripts (replacement in files, syncing dirs etc)"
+HOMEPAGE="https://github.com/vaeth/mv_perl/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.12"
+# || ( >=dev-lang/perl-5.9.4 >=virtual/perl-File-Spec-3.0 )
+# || ( >=dev-lang/perl-5.6.1 >=virtual/perl-Getopt-Long-2.24 )
+# || ( >=dev-lang/perl-5.7.3 virtual/perl-Digest-MD5 )
+# || ( >=dev-lang/perl-5.7.3 virtual/perl-Time-HiRes )
+
+src_prepare() {
+ epatch_user
+}
+
+src_install() {
+ dobin bin/*
+ dodoc README
+ insinto /usr/share/zsh/site-functions
+ doins zsh/_*
+}
+
+pkg_postinst() {
+ optfeature "support to set timestamps of symlinks" 'dev-perl/File-lchown'
+}
diff --git a/dev-util/mv_perl/mv_perl-4.2.ebuild b/dev-util/mv_perl/mv_perl-4.2.ebuild
deleted file mode 100644
index 5e00fd5a..00000000
--- a/dev-util/mv_perl/mv_perl-4.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2012-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="A collection of perl scripts (replacement in files, syncing dirs etc)"
-HOMEPAGE="https://github.com/vaeth/mv_perl/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# These should really depend on USE-flags but must not by policy.
-# Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283
-OPTIONAL_RDEPEND="dev-perl/File-lchown
-dev-perl/String-Escape
-dev-perl/String-ShellQuote"
-
-RDEPEND=">=dev-lang/perl-5.8
- || ( >=dev-lang/perl-5.9.4 >=virtual/perl-File-Spec-3.0 )
- ${OPTIONAL_RDEPEND}"
-# || ( >=dev-lang/perl-5.6.1 >=virtual/perl-Getopt-Long-2.24 )
-# || ( >=dev-lang/perl-5.7.3 virtual/perl-Digest-MD5 )
-# || ( >=dev-lang/perl-5.7.3 virtual/perl-Time-HiRes )
-
-src_prepare() {
- use prefix || sed -i \
- -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
- -- bin/* || die
- default
-}
-
-src_install() {
- dobin bin/*
- dodoc README.md
- insinto /usr/share/zsh/site-functions
- doins zsh/_*
-}
diff --git a/dev-util/pyrep/ChangeLog b/dev-util/pyrep/ChangeLog
new file mode 100644
index 00000000..9a9cb692
--- /dev/null
+++ b/dev-util/pyrep/ChangeLog
@@ -0,0 +1,54 @@
+# ChangeLog for dev-util/pyrep
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*pyrep-1.4-r1 (18 Jan 2015)
+
+ 10 Oct 2015; Martin Väth <martin@mvath.de>:
+ Update python dep
+
+ 15 Feb 2015; Martin Väth <martin@mvath.de>:
+ Fix python-single-r1 usage
+
+ 18 Jan 2015; Martin Väth <martin@mvath.de>:
+ Use new-style python dependency
+
+*pyrep-1.4 (10 Aug 2014)
+
+ 10 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*pyrep-1.3-r1 (17 Dec 2013)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix python path
+
+*pyrep-1.3 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*pyrep-1.2 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Shebang care
+
+*pyrep-1.1 (02 Mar 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 02 Mar 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/dev-util/pyrep/Manifest b/dev-util/pyrep/Manifest
index 7d50a6f0..516923ed 100644
--- a/dev-util/pyrep/Manifest
+++ b/dev-util/pyrep/Manifest
@@ -1 +1 @@
-DIST pyrep-1.5.tar.gz 9555 SHA512 3a2affa147da9e833432e2441dc1a1a3ea47e618695d6541ea6a4f04cb60b0708314814de191aea4e77a07b17f714454a7611f5f0989528e0ebabddd93a1cca0
+DIST pyrep-1.4.tar.gz 8622 SHA256 8051593becdd43ceaa3e0602f4d20c02f85b70233d443147ffbbb9ab715451f4 SHA512 9038b6368930628488f5e47a08262c9a51aec20172e8528d199d113653e445d37a69d4f07c00087cc8359e04fcf864ea72c749d9552b580d8f38ff62d8ec55f7 WHIRLPOOL 7a752cde3c1e84d2900dd3704ef2bdfb72ae06741c801cbcc6c3b11decf88674a108dce704dd4038a5e9c9b21c6b45d37a9e10fadc9853748f8c0bfb0f121fe9
diff --git a/dev-util/pyrep/metadata.xml b/dev-util/pyrep/metadata.xml
index 05021980..d9f498ac 100644
--- a/dev-util/pyrep/metadata.xml
+++ b/dev-util/pyrep/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/dev-util/pyrep/pyrep-1.4-r1.ebuild b/dev-util/pyrep/pyrep-1.4-r1.ebuild
new file mode 100644
index 00000000..c10ea901
--- /dev/null
+++ b/dev-util/pyrep/pyrep-1.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+PYTHON_COMPAT=( jython2_7 pypy{,3} python{2_7,3_{4,5}} )
+inherit eutils python-single-r1
+
+DESCRIPTION="Search and/or replace regular expressions within many files interactively"
+HOMEPAGE="https://github.com/vaeth/pyrep/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="${PYTHON_DEPS}"
+
+src_prepare() {
+ python_fix_shebang "${S}"
+ use prefix || sed -i \
+ -e '1s"^#!/usr/bin/env python$"#!'"${EPREFIX}/usr/bin/python"'"' \
+ -- "${PN}" || die
+ epatch_user
+}
+
+src_install() {
+ dobin "${PN}"
+ dodoc AUTHORS README
+}
diff --git a/dev-util/pyrep/pyrep-1.5-r1.ebuild b/dev-util/pyrep/pyrep-1.5-r1.ebuild
deleted file mode 100644
index dc53ffc1..00000000
--- a/dev-util/pyrep/pyrep-1.5-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2012-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="Search and/or replace regular expressions within many files interactively"
-HOMEPAGE="https://github.com/vaeth/pyrep/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-lang/python"
-
-src_prepare() {
- use prefix || sed -i \
- -e '1s"^#!/usr/bin/env python$"#!'"${EPREFIX}/usr/bin/python"'"' \
- -- bin/* || die
- default
-}
-
-src_install() {
- dobin bin/*
- dodoc AUTHORS README.md
- insinto /usr/share/zsh/site-functions
- doins zsh/_*
-}
diff --git a/dev-util/replacer/Manifest b/dev-util/replacer/Manifest
deleted file mode 100644
index 95ac8aca..00000000
--- a/dev-util/replacer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST replacer-3.3.tar.gz 16534 SHA512 12d502e145bcef376a7423036d7eed26036ac97ea8bed46390eabe174de7f3b757eed6fe4c84a89735dc745ec2dc99a942f8cb2d9b9f3cd41f127e84b13927ac
diff --git a/dev-util/replacer/metadata.xml b/dev-util/replacer/metadata.xml
deleted file mode 100644
index b6731dc7..00000000
--- a/dev-util/replacer/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <bugs-to>mailto:martin@mvath.de</bugs-to>
- <remote-id type="github">vaeth/replacer</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-util/replacer/replacer-3.3.ebuild b/dev-util/replacer/replacer-3.3.ebuild
deleted file mode 100644
index 3827f429..00000000
--- a/dev-util/replacer/replacer-3.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2018-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="Search and replace python regular expressions within many files interactively"
-HOMEPAGE="https://github.com/vaeth/replacer/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-PLOCALES="de"
-for i in ${PLOCALES}; do
- IUSE+=" l10n_${i}"
-done
-
-RDEPEND="dev-lang/python
- nls? ( virtual/libintl )"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
- local r
- use prefix || sed -i \
- -e '1s"^#!/usr/bin/env python$"#!'"${EPREFIX}/usr/bin/python"'"' \
- bin/* || die
- if use nls; then
- localepath=${EPREFIX}/usr/share/locale
- r="'${localepath}'"
- else
- r='None'
- fi
- sed -i \
- -e 's"^\(localedir[[:space:]]*=[[:space:]]*\).*"\1'"${r}\"" \
- bin/${PN} || die
- default
-}
-
-src_install() {
- local i
- if use nls; then
- export LINGUAS=
- for i in ${PLOCALES}; do
- use l10n_${i} && LINGUAS+=${LINGUAS:+ }${i}
- done
- po/install-mo "${D}${localepath}"
- fi
- dobin bin/*
- dodoc README.md
- insinto /usr/share/zsh/site-functions
- doins zsh/_*
-}
diff --git a/dev-vcs/git-wrappers-mv/Manifest b/dev-vcs/git-wrappers-mv/Manifest
deleted file mode 100644
index 614be5a3..00000000
--- a/dev-vcs/git-wrappers-mv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST git-wrappers-mv-2.2.tar.gz 6659 SHA512 4de0bf4fd48123c54d6cad903c41e695c4eee6847ece6242e15cc896da1b8690ed1504e279e280a4d52fbccafcee27112489c1fd0ec35b7e2135bcb2112092a8
diff --git a/dev-vcs/git-wrappers-mv/git-wrappers-mv-2.2.ebuild b/dev-vcs/git-wrappers-mv/git-wrappers-mv-2.2.ebuild
deleted file mode 100644
index 065a0910..00000000
--- a/dev-vcs/git-wrappers-mv/git-wrappers-mv-2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="Some personal wrappers for the most important git commands"
-HOMEPAGE="https://github.com/vaeth/git-wrappers-mv/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-4.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_prepare() {
- use prefix || sed -i \
- -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}"'/bin/sh"' \
- -- bin/git-[b-z]* || die
- default
-}
-
-src_install() {
- local i
- for i in bin/*
- do test -h "$i" || dobin "$i"
- done
- dosym git-tag /usr/bin/git-archive
- dosym git-commit /usr/bin/git-status
- dosym git-commit /usr/bin/git-update-index
- insinto /usr/share/zsh/site-functions
- doins zsh/*
- dodoc README
-}
diff --git a/dev-vcs/git-wrappers-mv/metadata.xml b/dev-vcs/git-wrappers-mv/metadata.xml
deleted file mode 100644
index e8c3cbed..00000000
--- a/dev-vcs/git-wrappers-mv/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <bugs-to>mailto:martin@mvath.de</bugs-to>
- <remote-id type="github">vaeth/git-wrappers-mv</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 4ff3f1a4..eb57196a 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,90 +1,33 @@
# ChangeLog for eclass directory
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
- 12 May 2012; Martin Väth <martin@mvath.de>:
- Created ChangeLog
+ 25 Jan 2015; Martin Väth <martin@mvath.de>:
+ avoid use_if_iuse in mv_mozextenstion.eclass to be fully pms compatible
- 12 May 2012; Martin Väth <martin@mvath.de>:
- base->eutils
+ 24 Jan 2015; Martin Väth <martin@mvath.de>:
+ Remove auteps from mv_mozextension.eclass
- 10 Jun 2012; Martin Väth <martin@mvath.de>:
- Remove support for icecat. Fix headers to make repoman happy
+ 14 Aug 2013; Martin Väth <martin@mvath.de>:
+ Simplify EPREFIX
- 26 Aug 2012; Martin Väth <martin@mvath.de>:
- Rename IUSE={copy,symlink}_extensions to {copy,symlink}-extensions to avoid
- possible collision with USE_EXPAND
+ 22 Sep 2012; Martin Väth <martin@mvath.de>:
+ Use AUTHOR tag. Use $ECLASS for message
21 Sep 2012; Martin Väth <martin@mvath.de>:
mv_mozextension: Use slot dependencies; requires at least EAPI=5
monotone: Remove useless DESCRIPTION
- 22 Sep 2012; Martin Väth <martin@mvath.de>:
- Use AUTHOR tag. Use $ECLASS for message
-
- 14 Aug 2013; Martin Väth <martin@mvath.de>:
- Simplify EPREFIX
-
- 24 Jan 2015; Martin Väth <martin@mvath.de>:
- Remove auteps from mv_mozextension.eclass
-
- 25 Jan 2015; Martin Väth <martin@mvath.de>:
- avoid use_if_iuse in mv_mozextension.eclass to be fully pms compatible
-
- 28 Nov 2015; Martin Väth <martin@mvath.de>:
- Replace mv_mozextension.eclass by mv_mozextension-r1.eclass without
- default phase functions for EAPI=6 compatibility
-
- 04 Dec 2015; Martin Väth <martin@mvath.de>:
- mv_mozextension-r1.eclass: Use BROWSER="..." with USE_EXPAND
- Allow to specify source/binary only
-
- 06 Feb 2016; Martin Väth <martin@mvath.de>:
- mv_mozextension-r1.eclass: Support palemoon
-
- 08 Feb 2016; Martin Väth <martin@mvath.de>:
- mv_mozextension-r1.eclass: Keep *.xpi compressed by default
-
- 08 Feb 2016; Martin Väth <martin@mvath.de>:
- mv_mozextension-r1.eclass: Support USE=compressed
-
- 29 Nov 2016; Martin Väth <martin@mvath.de>:
- stardict.eclass: Add from main gentoo repository
-
- 02 Dec 2016; Martin Väth <martin@mvath.de>:
- stardict.eclass: Remove again since it stays in main gentoo repository
-
- 28 Jan 2017; Martin Väth <martin@mvath.de>:
- mv_mozextension-r1.eclass: Support override by moz_atom()
-
- 03 Jun 2017; Martin Väth <martin@mvath.de>:
- Support new package layout by manually specifying id with option -i
-
- 25 Jul 2017; Martin Väth <martin@mvath.de>:
- Copy meson.eclass from gentoo tree, since developers refuse to make its
- use optionally: https://bugs.gentoo.org/show_bug.cgi?id=626054
-
- 26 Jul 2017; Martin Väth <martin@mvath.de>:
- Reflect changes in documentation of meson_optional.eclass
-
- 17 Sep 2017; Martin Väth <martin@mvath.de>:
- Support version specification in mv_mozextension-r1.eclass
-
- 04 Nov 2017; Martin Väth <martin@mvath.de>:
- Support manifest.json in mv_mozextension-r1.eclass
-
- 27 Dec 2017; Martin Väth <martin@mvath.de>:
- Remove meson_optional.eclass since meson.eclass in gentoo repository is fixed
-
- 27 Jan 2018; Martin Väth <martin@mvath.de>:
- mv_mozextension-r1.eclass: manifest.json: search "id" only inside "gecko"
+ 26 Aug 2012; Martin Väth <martin@mvath.de>:
+ Rename IUSE={copy,symlink}_extensions to {copy,symlink}-extensions to avoid
+ possible collision with USE_EXPAND
- 14 Apr 2018; Martin Väth <martin@mvath.de>:
- mv_mozextension-r1.eclass: remove support for legacy extensions
+ 10 Jun 2012; Martin Väth <martin@mvath.de>:
+ Remove support for icecat. Fix headers to make repoman happy.
- 07 May 2018; Martin Väth <martin@mvath.de>:
- monotone.eclass, mv_mozextension-r1.eclass: Support EAPI=7
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
- 14 May 2018; Martin Väth <martin@mvath.de>:
- rquired-use-warn.eclass: new eclass
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ Created ChangeLog
- 12 Aug 2018; Martin Väth <martin@mvath.de>:
- Add @SUPPORTED_EAPIS
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
deleted file mode 100644
index 501be73a..00000000
--- a/eclass/meson.eclass
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: meson.eclass
-# @MAINTAINER:
-# William Hubbs <williamh@gentoo.org>
-# Mike Gilbert <floppym@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
-# @BLURB: common ebuild functions for meson-based packages
-# @DESCRIPTION:
-# This eclass contains the default phase functions for packages which
-# use the meson build system.
-#
-# @EXAMPLE:
-# Typical ebuild using meson.eclass:
-#
-# @CODE
-# EAPI=6
-#
-# inherit meson
-#
-# ...
-#
-# src_configure() {
-# local emesonargs=(
-# -Dqt4=$(usex qt4 true false)
-# -Dthreads=$(usex threads true false)
-# -Dtiff=$(usex tiff true false)
-# )
-# meson_src_configure
-# }
-#
-# ...
-#
-# @CODE
-
-case ${EAPI:-0} in
- 6|7) ;;
- *) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-if [[ ${__MESON_AUTO_DEPEND+set} == "set" ]] ; then
- # See if we were included already, but someone changed the value
- # of MESON_AUTO_DEPEND on us. We could reload the entire
- # eclass at that point, but that adds overhead, and it's trivial
- # to re-order inherit in eclasses/ebuilds instead. #409611
- if [[ ${__MESON_AUTO_DEPEND} != ${MESON_AUTO_DEPEND} ]] ; then
- die "MESON_AUTO_DEPEND changed value between inherits; please inherit meson.eclass first! ${__MESON_AUTO_DEPEND} -> ${MESON_AUTO_DEPEND}"
- fi
-fi
-
-if [[ -z ${_MESON_ECLASS} ]]; then
-
-inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs
-
-fi
-
-EXPORT_FUNCTIONS src_configure src_compile src_test src_install
-
-if [[ -z ${_MESON_ECLASS} ]]; then
-_MESON_ECLASS=1
-
-MESON_DEPEND=">=dev-util/meson-0.51.2
- >=dev-util/ninja-1.8.2"
-
-# @ECLASS-VARIABLE: MESON_AUTO_DEPEND
-# @DESCRIPTION:
-# Set to 'no' to disable automatically adding to DEPEND. This lets
-# ebuilds form conditional depends by using ${MESON_DEPEND} in
-# their own DEPEND string.
-: ${MESON_AUTO_DEPEND:=yes}
-if [[ ${MESON_AUTO_DEPEND} != "no" ]] ; then
- if [[ ${EAPI:-0} == [0123456] ]]; then
- DEPEND=${MESON_DEPEND}
- else
- BDEPEND=${MESON_DEPEND}
- fi
-fi
-__MESON_AUTO_DEPEND=${MESON_AUTO_DEPEND} # See top of eclass
-
-# @ECLASS-VARIABLE: BUILD_DIR
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Build directory, location where all generated files should be placed.
-# If this isn't set, it defaults to ${WORKDIR}/${P}-build.
-
-# @ECLASS-VARIABLE: EMESON_SOURCE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# The location of the source files for the project; this is the source
-# directory to pass to meson.
-# If this isn't set, it defaults to ${S}
-
-# @VARIABLE: emesonargs
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Optional meson arguments as Bash array; this should be defined before
-# calling meson_src_configure.
-
-# @VARIABLE: emesontestargs
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Optional meson test arguments as Bash array; this should be defined before
-# calling meson_src_test.
-
-
-read -d '' __MESON_ARRAY_PARSER <<"EOF"
-import shlex
-import sys
-
-# See http://mesonbuild.com/Syntax.html#strings
-def quote(str):
- escaped = str.replace("\\\\", "\\\\\\\\").replace("'", "\\\\'")
- return "'{}'".format(escaped)
-
-print("[{}]".format(
- ", ".join([quote(x) for x in shlex.split(" ".join(sys.argv[1:]))])))
-EOF
-
-# @FUNCTION: _meson_env_array
-# @INTERNAL
-# @DESCRIPTION:
-# Parses the command line flags and converts them into an array suitable for
-# use in a cross file.
-#
-# Input: --single-quote=\' --double-quote=\" --dollar=\$ --backtick=\`
-# --backslash=\\ --full-word-double="Hello World"
-# --full-word-single='Hello World'
-# --full-word-backslash=Hello\ World
-# --simple --unicode-8=© --unicode-16=𐐷 --unicode-32=𐤅
-#
-# Output: ['--single-quote=\'', '--double-quote="', '--dollar=$',
-# '--backtick=`', '--backslash=\\', '--full-word-double=Hello World',
-# '--full-word-single=Hello World',
-# '--full-word-backslash=Hello World', '--simple', '--unicode-8=©',
-# '--unicode-16=𐐷', '--unicode-32=𐤅']
-#
-_meson_env_array() {
- python -c "${__MESON_ARRAY_PARSER}" "$@"
-}
-
-# @FUNCTION: _meson_create_cross_file
-# @INTERNAL
-# @DESCRIPTION:
-# Creates a cross file. meson uses this to define settings for
-# cross-compilers. This function is called from meson_src_configure.
-_meson_create_cross_file() {
- # Reference: http://mesonbuild.com/Cross-compilation.html
-
- # system roughly corresponds to uname -s (lowercase)
- local system=unknown
- case ${CHOST} in
- *-aix*) system=aix ;;
- *-cygwin*) system=cygwin ;;
- *-darwin*) system=darwin ;;
- *-freebsd*) system=freebsd ;;
- *-linux*) system=linux ;;
- mingw*|*-mingw*) system=windows ;;
- *-solaris*) system=sunos ;;
- esac
-
- local cpu_family=$(tc-arch)
- case ${cpu_family} in
- amd64) cpu_family=x86_64 ;;
- arm64) cpu_family=aarch64 ;;
- esac
-
- # This may require adjustment based on CFLAGS
- local cpu=${CHOST%%-*}
-
- cat > "${T}/meson.${CHOST}.${ABI}" <<-EOF
- [binaries]
- ar = $(_meson_env_array "$(tc-getAR)")
- c = $(_meson_env_array "$(tc-getCC)")
- cpp = $(_meson_env_array "$(tc-getCXX)")
- fortran = $(_meson_env_array "$(tc-getFC)")
- llvm-config = '$(tc-getPROG LLVM_CONFIG llvm-config)'
- objc = $(_meson_env_array "$(tc-getPROG OBJC cc)")
- objcpp = $(_meson_env_array "$(tc-getPROG OBJCXX c++)")
- pkgconfig = '$(tc-getPKG_CONFIG)'
- strip = $(_meson_env_array "$(tc-getSTRIP)")
- windres = $(_meson_env_array "$(tc-getRC)")
-
- [properties]
- c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}")
- c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}")
- cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}")
- cpp_link_args = $(_meson_env_array "${CXXFLAGS} ${LDFLAGS}")
- fortran_args = $(_meson_env_array "${FCFLAGS}")
- fortran_link_args = $(_meson_env_array "${FCFLAGS} ${LDFLAGS}")
- objc_args = $(_meson_env_array "${OBJCFLAGS} ${CPPFLAGS}")
- objc_link_args = $(_meson_env_array "${OBJCFLAGS} ${LDFLAGS}")
- objcpp_args = $(_meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}")
- objcpp_link_args = $(_meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}")
-
- [host_machine]
- system = '${system}'
- cpu_family = '${cpu_family}'
- cpu = '${cpu}'
- endian = '$(tc-endian)'
- EOF
-}
-
-# @FUNCTION: meson_use
-# @USAGE: <USE flag> [option name]
-# @DESCRIPTION:
-# Given a USE flag and meson project option, outputs a string like:
-#
-# -Doption=true
-# -Doption=false
-#
-# If the project option is unspecified, it defaults to the USE flag.
-meson_use() {
- usex "$1" "-D${2-$1}=true" "-D${2-$1}=false"
-}
-
-# @FUNCTION: meson_feature
-# @USAGE: <USE flag> [option name]
-# @DESCRIPTION:
-# Given a USE flag and meson project option, outputs a string like:
-#
-# -Doption=enabled
-# -Doption=disabled
-#
-# If the project option is unspecified, it defaults to the USE flag.
-meson_feature() {
- usex "$1" "-D${2-$1}=enabled" "-D${2-$1}=disabled"
-}
-
-# @FUNCTION: meson_src_configure
-# @USAGE: [extra meson arguments]
-# @DESCRIPTION:
-# This is the meson_src_configure function.
-meson_src_configure() {
- debug-print-function ${FUNCNAME} "$@"
-
- # Common args
- local mesonargs=(
- --buildtype plain
- --libdir "$(get_libdir)"
- --localstatedir "${EPREFIX}/var/lib"
- --prefix "${EPREFIX}/usr"
- --sysconfdir "${EPREFIX}/etc"
- --wrap-mode nodownload
- )
-
- if tc-is-cross-compiler || [[ ${ABI} != ${DEFAULT_ABI-${ABI}} ]]; then
- _meson_create_cross_file || die "unable to write meson cross file"
- mesonargs+=( --cross-file "${T}/meson.${CHOST}.${ABI}" )
- fi
-
- # https://bugs.gentoo.org/625396
- python_export_utf8_locale
-
- # Append additional arguments from ebuild
- mesonargs+=("${emesonargs[@]}")
-
- BUILD_DIR="${BUILD_DIR:-${WORKDIR}/${P}-build}"
- set -- meson "${mesonargs[@]}" "$@" \
- "${EMESON_SOURCE:-${S}}" "${BUILD_DIR}"
- echo "$@"
- tc-env_build "$@" || die
-}
-
-# @FUNCTION: meson_src_compile
-# @USAGE: [extra ninja arguments]
-# @DESCRIPTION:
-# This is the meson_src_compile function.
-meson_src_compile() {
- debug-print-function ${FUNCNAME} "$@"
-
- eninja -C "${BUILD_DIR}" "$@"
-}
-
-# @FUNCTION: meson_src_test
-# @USAGE: [extra meson test arguments]
-# @DESCRIPTION:
-# This is the meson_src_test function.
-meson_src_test() {
- debug-print-function ${FUNCNAME} "$@"
-
- local mesontestargs=(
- -C "${BUILD_DIR}"
- )
- [[ -n ${NINJAOPTS} || -n ${MAKEOPTS} ]] &&
- mesontestargs+=(
- --num-processes "$(makeopts_jobs ${NINJAOPTS:-${MAKEOPTS}})"
- )
-
- # Append additional arguments from ebuild
- mesontestargs+=("${emesontestargs[@]}")
-
- set -- meson test "${mesontestargs[@]}" "$@"
- echo "$@" >&2
- "$@" || die "tests failed"
-}
-
-# @FUNCTION: meson_src_install
-# @USAGE: [extra ninja install arguments]
-# @DESCRIPTION:
-# This is the meson_src_install function.
-meson_src_install() {
- debug-print-function ${FUNCNAME} "$@"
-
- DESTDIR="${D}" eninja -C "${BUILD_DIR}" install "$@"
- einstalldocs
-}
-
-fi
diff --git a/eclass/monotone.eclass b/eclass/monotone.eclass
index 5268660a..a8d6ec46 100644
--- a/eclass/monotone.eclass
+++ b/eclass/monotone.eclass
@@ -1,12 +1,12 @@
-# Copyright 2010-2018 Martin V\"ath
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
# @ECLASS: monotone.eclass
# @MAINTAINER:
# Martin Väth <martin@mvath.de>
# @AUTHOR:
# Martin Väth <martin@mvath.de>
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
# @BLURB: The monotone eclass is written to fetch software sources from monotone repositories
# @DESCRIPTION:
# The monotone eclass provides functions to fetch software sources from
@@ -192,11 +192,6 @@ monotone_src_unpack() {
monotone_finish
}
-[ -n "${EMTN_DISABLE_DEPENDENCIES}" ] || case ${EAPI:-0} in
-0|1|2|3|4|5|6)
- DEPEND='dev-vcs/monotone';;
-*)
- BDEPEND='dev-vcs/monotone';;
-esac
+[ -n "${EMTN_DISABLE_DEPENDENCIES}" ] || DEPEND='dev-vcs/monotone'
EXPORT_FUNCTIONS src_unpack
diff --git a/eclass/mv_mozextension-r1.eclass b/eclass/mv_mozextension-r1.eclass
deleted file mode 100644
index d8f27a46..00000000
--- a/eclass/mv_mozextension-r1.eclass
+++ /dev/null
@@ -1,487 +0,0 @@
-# Copyright 2015-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: mv_mozextension-r1.eclass
-# @MAINTAINER:
-# Martin Väth <martin@mvath.de>
-# @SUPPORTED_EAPIS: 6 7
-# @BLURB: This eclass provides functions to install mozilla extensions
-# @DESCRIPTION:
-# The eclass is based on mozextension.eclass with many extensions
-# and compatiblity fixes.
-# @EXAMPLE:
-# @CODE
-# inherit mv_mozextension-r1
-#
-# moz_defaults firefox seamonkey # no arguments mean all browsers
-#
-# @CODE
-# inherit mv_mozextension-r1
-#
-# MOZ="<firefox-57 seamonkey"
-# BDEPEND=${MOZ_BDEPEND}
-# RDEPEND=$(moz_rdepend ${MOZ})
-# IUSE=$(moz_iuse ${MOZ})
-# REQUIRED_USE=$(moz_required_use ${MOZ})
-#
-# src_unpack() {
-# moz_unpack
-# }
-#
-# src_install() {
-# moz_install
-# }
-
-case ${EAPI:-0} in
-[0-5])
- die "EAPI ${EAPI} not supported by ${ECLASS}";;
-esac
-
-# @FUNCTION: moz_defaults
-# @USAGE: [-c|-C|-n] [--] [<browser>] [<browser>] [...]
-# @DESCRIPTION:
-# This is just a convenience wrapper for moz_variables [args]; moz_phases [args]
-moz_defaults() {
- moz_variables "${@}"
- moz_phases "${@}"
-}
-
-# @FUNCTION: moz_variables
-# @USAGE: [-c|-C|-n] [-i id] [--] [<browser>] [<browser>] [...]
-# @DESCRIPTION:
-# Sets the variables DEPEND, RDEPEND, IUSE, REQUIRED_USE for browsers.
-# browser is (firefox|seamonkey) and implies source or binary version.
-# If no browser is specified, all are assumed.
-# If option -C or -n is specified, IUSE=compressed is not default/added.
-moz_variables() {
- local o opt
- o=
- OPTIND=1
- while getopts 'cCni:' opt
- do case ${opt} in
- [cCn])
- o="-${opt}";;
- *)
- :;;
- esac
- done
- shift $(( ${OPTIND} - 1 ))
- case ${EAPI} in
- 6)
- DEPEND=${MOZ_BDEPEND};;
- *)
- BDEPEND=${MOZ_BDEPEND};;
- esac
- RDEPEND=$(moz_rdepend "${@}")
- IUSE=$(moz_iuse ${o} "${@}")
- REQUIRED_USE=$(moz_required_use "${@}")
-}
-
-# @FUNCTION: moz_phases
-# @USAGE: [-cCn] [-i id] [--] [ignored args]
-# @DESCRIPTION:
-# Defines src_unpack and src_install to call only moz_unpack and moz_install.
-moz_phases() {
- local o
- o=()
- OPTIND=1
- while getopts 'cCni:' opt
- do case ${opt} in
- [cCn])
- o+=("-${opt}");;
- *)
- o+=("-${opt}" "${OPTARG}");;
- esac
- done
- shift $(( ${OPTIND} - 1 ))
- set -- "${o[@]}"
- if [ $# -eq 0 ]
- then quoteargs=
- else quoteargs=`printf ' %q' "$@"`
- fi
- eval "src_unpack() {
-moz_unpack$quoteargs
-}
- src_install() {
-moz_install$quoteargs
-}"
-}
-
-# @ECLASS-VARIABLE: MOZ_BDEPEND
-# @DESCRIPTION:
-# This is an eclass-generated depend expression needed for moz_unpack to work
-MOZ_BDEPEND='app-arch/unzip'
-
-# @FUNCTION: moz_split_browser
-# @USAGE: <browser>
-# @DESCRIPTION:
-# browser is one of [operator](firefox|seamonkey)[-source|-bin][*].
-# The function outputs the "browser[-source|-bin]" part
-moz_split_browser() {
- local browser
- for browser in firefox seamonkey
- do case ${1} in
- *"${browser}"?source*)
- echo "${browser}-source"
- return;;
- *"${browser}"?bin*)
- echo "${browser}-bin"
- return;;
- *"${browser}"*)
- echo "${browser}"
- return;;
- esac
- done
- die "args must be [operator](firefox|seamonkey)[-source|-bin][*]"
-}
-
-# @FUNCTION: moz_split_operator
-# @USAGE: <browser>
-# @DESCRIPTION:
-# browser is one of [operator](firefox|seamonkey)[-source|-bin][*].
-# The function outputs the "[operator]" part
-moz_split_operator() {
- local browser operator
- for browser in firefox seamonkey
- do case ${1} in
- *"${browser}"*)
- operator=${1%%"${browser}"*}
- echo "${operator}"
- return;;
- esac
- done
- die "args must be [operator](firefox|seamonkey)[-source|-bin][*]"
-}
-
-# @FUNCTION: moz_split_rest
-# @USAGE: <browser>
-# @DESCRIPTION:
-# browser is one of [operator](firefox|seamonkey)[-source|-bin][*].
-# The function outputs the "[*]" part
-moz_split_rest() {
- local front rest
- for front in source bin firefox seamonkey
- do case ${1} in
- *"${front}"*)
- rest=${1#*"${front}"}
- echo "${rest}"
- return;;
- esac
- done
- die "args must be [operator](firefox|seamonkey)[-source|-bin][*]"
-}
-
-# @FUNCTION: moz_atom
-# @USAGE: <browser> <operator> <rest>
-# @DESCRIPTION:
-# Prints the atom/subexpression used in RDEPEND for the corresponding browser,
-# e.g. [operator]www-client/firefox-bin[rest]
-# browser is one of (firefox|seamonkey)(-source|-bin)
-# If nothing is printed, the output of
-# "moz_atom_default <browser> <operator> <rest>"
-# is used (see below).
-# moz_atom is meant to be defined by the ebuild if non-defaults are used.
-# @DEFAULT_UNSET
-
-# @FUNCTION: moz_atom_default
-# @USAGE: <browser> <operator> <rest>
-# @DESCRIPTION:
-# Prints the atom/subexpression used in RDEPEND for the corresponding browser,
-# when moz_atom is not defined or prints nothing.
-# browser is one of (firefox|seamonkey)(-source|-bin).
-moz_atom_default() {
- echo "${2}www-client/${1%?source}${3}"
-}
-
-# @FUNCTION: moz_rdepend
-# @USAGE: [<browser>] [<browser>] [...]
-# @DESCRIPTION:
-# Outputs RDEPEND expression appropriate for browsers.
-# browser is one of [operator](firefox|seamonkey)[-source|-bin][*]
-# (none specified = all browsers)
-# Note that moz_rdepend_atom (if defined by the ebuild) is used to calculate
-# the expression.
-moz_rdepend() {
- local arg rdep browser count modes mode atom useflag operator rest
- [ ${#} -ne 0 ] || set -- firefox seamonkey
- count=
- rdep=
- for arg
- do browser=`moz_split_browser "${arg}"`
- operator=`moz_split_operator "${arg}"`
- rest=`moz_split_rest "${arg}"`
- modes="source bin"
- case ${browser} in
- *source*)
- browser=${browser%?source*}
- modes=source;;
- *bin*)
- browser=${browser%?bin*}
- modes=bin;;
- esac
- for mode in $modes
- do atom=
- [ "$(type -t moz_atom)" != "function" ] || \
- atom=`moz_atom "${browser}-${mode}" "${operator}" "${rest}"`
- [ -n "$atom" ] || \
- atom=`moz_atom_default "${browser}-${mode}" "${operator}" "${rest}"`
- useflag=browser_${browser}
- [ "$mode" = "source" ] || useflag=${useflag}-${mode}
- rdep=${rdep}${rdep:+\ }"${useflag}? ( ${atom} )"
- count=${count}a
- done
- done
- [ "${count}" = a ] && echo "${rdep}" || echo "|| ( ${rdep} )"
-}
-
-# @FUNCTION: moz_iuse
-# @USAGE: [-c|-C|-n] [--] [<browser>] [<browser>] [...]
-# @DESCRIPTION:
-# Outputs IUSE expression appropriate for browsers.
-# browser is [opertator](firefox|seamonkey)[-source|-bin][*]
-# (none specified = all browsers).
-# If option -C or -n is specified, IUSE=compressed is not default/added.
-moz_iuse() {
- local iuse i opt
- iuse="+compressed"
- OPTIND=1
- while getopts 'cCn' opt
- do case ${opt} in
- c) iuse="+compressed";;
- C) iuse="compressed";;
- n) iuse=;;
- esac
- done
- shift $(( ${OPTIND} - 1 ))
- [ ${#} -ne 0 ] || set -- firefox seamonkey
- for i in firefox seamonkey
- do case "${*}" in
- *"${i}"?source*)
- iuse=${iuse}${iuse:+\ }"browser_${i}";;
- *"${i}"?bin*)
- iuse=${iuse}${iuse:+\ }"browser_${i}-bin";;
- *"${i}"*)
- iuse=${iuse}${iuse:+\ }"browser_${i} browser_${i}-bin";;
- esac
- done
- [ -n "${iuse}" ] || die "args must be [operator](firefox|seamonkey)[-source|-bin][*]"
- echo "${iuse}"
-}
-
-# @FUNCTION: moz_required_use
-# @USAGE: [<browser>] [<browser>] [...]
-# @DESCRIPTION:
-# Outputs REQUIRED_USE expression appropriate for browsers.
-# browser is [operator](firefox|seamonkey)[-source|-bin][*]
-# (none specified = all browsers).
-moz_required_use() {
- set -- $(moz_iuse -n "${@}")
- [ ${#} -lt 2 ] && echo "${*}" || echo "|| ( ${*} )"
-}
-
-# @FUNCTION: moz_unpack
-# @USAGE: [-c|-C|-n] [-i id] [--] <file> <file> [...]
-# @DESCRIPTION:
-# Unpack xpi files. If no file is specified, ${A} is used.
-# Option -c means compression mode (partial unpack), independent of USE
-# Option -n means no-compression mode (full unpack), independent of USE
-moz_unpack() {
- local xpi srcdir xpiname archiv comp opt id
- id=false
- comp=
- OPTIND=1
- while getopts 'Ccni:' opt
- do case ${opt} in
- c) comp=:;;
- n) comp=false;;
- C) comp=;;
- i) id=:;;
- esac
- done
- shift $(( ${OPTIND} - 1 ))
- if [ -z "${comp}" ] && in_iuse compressed && ! use compressed
- then comp=false
- else comp=:
- fi
- [ ${#} -ne 0 ] || set -- ${A}
- test -d "${S}" || mkdir "${S}" || die "cannot create ${S}"
- for xpi
- do einfo "Unpacking ${xpi} to ${S} (partially)"
- xpiname=${xpi%.*}
- xpiname=${xpiname##*/}
-
- case ${xpi} in
- ./*|/*)
- srcdir=;;
- *)
- srcdir="${DISTDIR}/";;
- esac
-
- test -f "${srcdir}${xpi}" || die "${xpi} does not exist or is no file"
-
- case ${xpi##*.} in
- ZIP|zip|jar|xpi)
- :;;
- *)
- einfo "unpack ${xpi}: file format not recognized. Ignoring.";;
- esac
- archiv="${S}/${xpiname}.xpi"
- einfo "Copying ${xpi} to ${archiv}"
- cp -p -- "${srcdir}${xpi}" "${archiv}" || die
- chmod 644 -- "${archiv}" || die
- mkdir -- "${S}/${xpiname}" || die
- cd -- "${S}/${xpiname}" || die
- if ${comp}
- then if ! ${id}
- then einfo "Extracting manifest.json for ${xpiname}"
- unzip -qo -- "${archiv}" manifest.json
- # Do not die on failure: One of the two files will not exist
- fi
- else einfo "Unpacking ${xpiname}"
- unzip -qo -- "${archiv}" || die
- chmod -R a+rX,u+w,go-w -- "${S}/${xpiname}" || die
- fi
- done
-}
-
-# @FUNCTION: moz_getid
-# @USAGE: <variable> [<path/to/manifest.json>]
-# @DESCRIPTION:
-# Extracts the package id from the manifest.json
-# and stores the result in the variable.
-moz_getid() {
- local var res sub dir file
- [ ${#} -ne 0 ] || die "${FUNCNAME} needs at least one argument"
- var=${1}
- dir=${2:-.}
- dir=${dir%/}
- test -d "${dir}" || die "moz_getid: argument must be a directory"
- file=${dir}/manifest.json
- test -f "${file}" || die "cannot find ${file}"
- sub='/^[[:space:]]*["'\'']gecko["'\''][[:space:]]*:/,/\}/s/'
- sub=${sub}'^[[:space:]]*["'\'']id["'\''][[:space:]]*:[[:space:]]*'
- sub=${sub}'["'\'']\(.*\)["'\''][[:space:]]*,\?[[:space:]]*$/\1/p'
- res=$(sed -n -e "${sub}" -- "${file}") || res=
- [ -n "${res}" ] || die "failed to determine id from ${file}"
- eval ${var}=\${res}
-}
-
-# @FUNCTION: moz_install_to_dir
-# @USAGE: [-n] [-i id] [--] <extension-directory> <dir> <dir> [...]
-# @DESCRIPTION:
-# Installs dir.xpi as (id) of extension-directory.
-# If -i is not passed it is determined from ${dir}/manifest.json
-# Arguments which are not directories are silently ignored.
-# If arguments are specified, they must contain at least one directory.
-# If no argument is specified, all directories from "${S}" are considered.
-# Option -n means nocompression mode: Install dir instead of dir.xpi.
-moz_install_to_dir() {
- local id dest i have comp opt
- comp=:
- id=
- OPTIND=1
- while getopts 'cni:' opt
- do case ${opt} in
- i) id=${OPTARG};;
- c) comp=:;;
- n) comp=false;;
- esac
- done
- shift $(( ${OPTIND} - 1 ))
- [ ${#} -ne 0 ] || die "${FUNCNAME} needs at least one argument"
- dest=${1%/}
- shift
- dodir "${dest}"
- [ ${#} -gt 0 ] || set -- "${S}"/*
- have=false
- for i
- do [ -n "${i}" ] && test -d "${i}" || continue
- have=:
- [ -n "${id}" ] || moz_getid id "${i}"
- if ${comp}
- then ln -- "${i}.xpi" "${ED}${dest}/${id}.xpi" \
- || cp -- "${i}.xpi" "${ED}${dest}/${id}.xpi" || die
- else id=${dest}/${id}
- dodir "${id}" || die "failed to create ${id}"
- cp -RPl -- "${i}"/* "${ED}${id}" || {
- insinto "${id}" && doins -r "${i}"/*
- } || die
- fi
- done
- ${have} || die "no directory found in argument list"
-}
-
-# @FUNCTION: moz_install_for_browser
-# @USAGE: [-n] [-i id] [--] <browser> <dir> <dir> [...]
-# @DESCRIPTION:
-# Installs dirs.xpi for browser.
-# browser is [operator](firefox|seymonkey)[-source|-bin][*]
-# Arguments which are not directories are silently ignored.
-# If arguments are specified, they must contain at least one directory.
-# If no argument is specified, all directories from "${S}" are considered.
-# Option -n means nocompression mode: Install dirs instead of dirs.xpi.
-moz_install_for_browser() {
- local dest firefox seamonkey o opt
- o=()
- OPTIND=1
- while getopts 'cni:' opt
- do case ${opt} in
- [cn])
- o+=("-$opt");;
- *)
- o+=("-$opt" "${OPTARG}");;
- esac
- done
- shift $(( ${OPTIND} - 1 ))
- [ ${#} -ne 0 ] || die "${FUNCNAME} needs at least one argument"
- firefox="firefox/browser/extensions"
- seamonkey="seamonkey/extensions"
- case ${1} in
- *firefox*bin*)
- dest="/opt/${firefox}";;
- *firefox*)
- dest="/usr/$(get_libdir)/${firefox}";;
- *seamonkey?bin*)
- dest="/opt/${seamonkey}";;
- *seamonkey*)
- dest="/usr/$(get_libdir)/${seamonkey}";;
- *)
- die "unknown browser specified";;
- esac
- shift
- moz_install_to_dir "${o[@]}" -- "${dest}" "${@}"
-}
-
-# @FUNCTION: moz_install
-# @USAGE: [-c|-n|-C] [-i id] [--] <dir> <dir> [...]
-# @DESCRIPTION:
-# Installs dirs/dirs.xpi into appropriate destinations, depending on USE.
-# Arguments which are not directories are silently ignored.
-# If arguments are specified, they must contain at least one directory.
-# If no argument is specified, all directories from "${S}" are considered.
-# Option -n means to install dir instead of dirs.xpi, independent on USE.
-# Option -c means to install dir.xpi, independent on USE.
-moz_install() {
- local i id o opt
- id=
- o="?"
- OPTIND=1
- while getopts 'cCni:' opt
- do case ${opt} in
- c) o=;;
- n) o="-n";;
- C) o="?";;
- i) id=$OPTARG;;
- esac
- done
- shift $(( ${OPTIND} - 1 ))
- if [ "${o}" = "?" ] && in_iuse compressed && ! use compressed
- then o="-n"
- else o=
- fi
- for i in firefox firefox-bin seamonkey seamonkey-bin
- do if in_iuse "browser_${i}" && use "browser_${i}"
- then moz_install_for_browser ${o} ${id:+-i "$id"} -- "${i}" "${@}"
- fi
- done
-}
diff --git a/eclass/mv_mozextension.eclass b/eclass/mv_mozextension.eclass
new file mode 100644
index 00000000..7d3ab08d
--- /dev/null
+++ b/eclass/mv_mozextension.eclass
@@ -0,0 +1,154 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# @ECLASS: mv_mozextension.eclass
+# @MAINTAINER:
+# Martin Väth <martin@mvath.de>
+# @BLURB: This eclass provides functions to install mozilla extensions
+# @DESCRIPTION:
+# The eclass is based on mozextension.eclass with many extensions.
+# 1. It has some compatibility fixes in xpi_install/xpi_unpack.
+# 2. A default src_unpack function is defined; set FILENAME to the archive name.
+# If FILENAME is unset or empty, the last part of the last SRC_URI is used.
+# 3. Default functions for installation for all mozilla type browsers.
+
+# @ECLASS-VARIABLE: MV_MOZ_MOZILLAS
+# @DESCRIPTION:
+# If this variables is set to the empty value, no default install functions
+# are defined. Otherwise, the value of this variable should be
+# "firefox seamonkey" (default)
+# or a subset of these.
+# The eclass will then install the extension for all these mozillas,
+# set corresponding dependencies and print corresponding messages.
+: ${MV_MOZ_MOZILLAS=firefox seamonkey}
+
+inherit eutils multilib
+
+case ${EAPI:-0} in
+[01234])
+ die "EAPI ${EAPI} no longer supported by ${ECLASS}";;
+esac
+
+MV_MOZ_IUSE=
+RDEPEND='|| ('
+case ${MV_MOZ_MOZILLAS} in
+*fire*)
+ MV_MOZ_IUSE="${MV_MOZ_IUSE}${MV_MOZ_IUSE:+ }firefox firefox-bin"
+ RDEPEND="${RDEPEND}
+ firefox? ( >=www-client/firefox-21 )
+ firefox-bin? ( >=www-client/firefox-bin-21 )"
+esac
+case ${MV_MOZ_MOZILLAS} in
+*sea*)
+ MV_MOZ_IUSE="${MV_MOZ_IUSE}${MV_MOZ_IUSE:+ }seamonkey seamonkey-bin"
+ RDEPEND="${RDEPEND}
+ seamonkey? ( www-client/seamonkey )
+ seamonkey-bin? ( www-client/seamonkey-bin )"
+esac
+RDEPEND="${RDEPEND} )"
+IUSE=${MV_MOZ_IUSE}
+REQUIRED_USE="|| ( ${MV_MOZ_IUSE} )"
+
+DEPEND='app-arch/unzip'
+
+mv_mozextension_src_unpack() {
+ local i
+ if [ -z "${FILENAME}" ]
+ then for i in ${SRC_URI}
+ do FILENAME=${i##*/}
+ done
+ fi
+ xpi_unpack "${FILENAME}"
+}
+
+mv_mozextension_src_prepare() {
+ epatch_user
+}
+
+EXPORT_FUNCTIONS src_unpack src_prepare
+
+mv_mozextension_src_install() {
+ local b e
+ b="${EPREFIX}/usr/$(get_libdir)"
+ e="${EPREFIX}/opt"
+ mv_mozextension_install firefox "${b}/firefox/browser/extensions"
+ mv_mozextension_install firefox-bin "${e}/firefox/browser/extensions"
+ mv_mozextension_install seamonkey "${b}/seamonkey/extensions"
+ mv_mozextension_install seamonkey-bin "${e}/seamonkey/extensions"
+}
+
+[ -z "${MV_MOZ_MOZILLAS}" ] || EXPORT_FUNCTIONS src_install
+
+xpi_unpack() {
+ local xpi srcdir u
+
+ # Not gonna use ${A} as we are looking for a specific option being passed to function
+ # You must specify which xpi to use
+ [ ${#} -eq 0 ] && die \
+ "Nothing passed to the ${FUNCNAME} command. Please pass which xpi to unpack"
+
+ test -d "${S}" || mkdir "${S}" || die
+ for xpi
+ do einfo "Unpacking ${xpi} to ${S}"
+ xpiname=${xpi%.*}
+ xpiname=${xpiname##*/}
+
+ case ${xpi} in
+ ./*|/*)
+ srcdir=;;
+ *)
+ srcdir="${DISTDIR}/";;
+ esac
+
+ test -s "${srcdir}${xpi}" || die "${xpi} does not exist"
+
+ case ${xpi##*.} in
+ ZIP|zip|jar|xpi)
+ mkdir -- "${S}/${xpiname}" && \
+ cd -- "${S}/${xpiname}" && \
+ unzip -qo -- "${srcdir}${xpi}" \
+ || die "failed to unpack ${xpi}"
+ chmod -R a+rX,u+w,go-w -- "${S}/${xpiname}";;
+ *)
+ einfo "unpack ${xpi}: file format not recognized. Ignoring.";;
+ esac
+ done
+}
+
+xpi_install() {
+ local d x
+
+ # You must tell xpi_install which dir to use
+ [ ${#} -eq 1 ] || die "${FUNCNAME} takes exactly one argument. Please specify the directory"
+
+ x=${1}
+ # determine id for extension
+ d='{ /\<\(em:\)*id\>/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }'
+ d=$(sed -n -e '/install-manifest/,$ '"${d}" "${x}"/install.rdf) \
+ && [ -n "${d}" ] || die 'failed to determine extension id'
+ : ${MOZILLA_EXTENSIONS_DIRECTORY:="${MOZILLA_FIVE_HOME}/extensions"}
+ d="${MOZILLA_EXTENSIONS_DIRECTORY}/${d}"
+ test -d "${D}${d}" || dodir "${d}" || die "failed to create ${d}"
+ cp -RPl -- "${x}"/* "${D}${d}" || {
+ ewarn 'Failed to hardlink extension. Falling back to USE=copy-extensions'
+ insinto "${d}" && doins -r "${x}"/*
+ } || die 'failed to copy extension'
+}
+
+# This function is called by mv_mozextension_src_install
+# and should be overridden if the paths do not match:
+# It just should call xpi_install with the correct argument(s)
+xpi_install_dirs() {
+ local d
+ for d in "${S}"/*
+ do [ -n "${d}" ] && test -d "${d}" && xpi_install "${d}"
+ done
+}
+
+mv_mozextension_install() {
+ local MOZILLA_EXTENSIONS_DIRECTORY
+ has "${1}" ${MV_MOZ_IUSE} && use "${1}" || return 0
+ MOZILLA_EXTENSIONS_DIRECTORY=${2}
+ xpi_install_dirs
+}
diff --git a/eclass/required-use-warn.eclass b/eclass/required-use-warn.eclass
deleted file mode 100644
index 20c56b67..00000000
--- a/eclass/required-use-warn.eclass
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: required-use-warn.eclass
-# @MAINTAINER:
-# Martin Väth <martin@mvath.de>
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
-# @BLURB: This eclass support REQUIRED_USE_WARN
-# @DESCRIPTION:
-# The eclass provides support for REQUIRED_USE_WARN.
-# REQUIRED_USE_WARN is similar to REQUIRED_USE except that only warnings are
-# are printed if a condition is violated.
-# The only supported conditions are of the type
-# FLAG
-# !FLAG
-# A? ( B C ... )
-# where each of A B C ... are of some of the 3 types.
-# @EXAMPLE:
-# To warn that USE=bazola is ignored (if USE="foo -bar bazola" is active)
-# and that USE=BAR is implicitly enabled (if USE="FOO -BAR" is active) use:
-# @CODE
-# inherit required-use-warn
-#
-# REQUIRED_USE_WARN="foo? ( !bar? ( !bazola ) ) !FOO? ( BAR )
-# pkg_pretend() {
-# required-use-warn
-# }
-
-# @FUNCTION: required-use-warn_internal
-# @USAGE: string
-# @INTERNAL
-# @DESCRIPTION:
-# Print warnings according to the passed normalized string.
-# Normalized means only spaces, none superfluous
-required-use-warn_internal() {
- local first curr cond negate satisfied rest second open pass brace
- [ -n "${1}" ] || return 0
- first=${1%%' '*}
- if [ "${first}" = "${1}" ]; then
- rest=
- else
- rest=${1#*' '}
- fi
- cond=${first#'!'}
- [ "${cond}" = "${first}" ] && negate=false || negate=:
- curr=${cond%'?'}
- [ "${curr}" = "${cond}" ] && cond=false || cond=:
- satisfied=false
- if use "${curr}"; then
- ${negate} || satisfied=:
- else
- ! ${negate} || satisfied=:
- fi
- if ! $cond; then
- if ! ${satisfied}; then
- if ${negate}; then
- ewarn "Ignoring USE=${curr} for ${CATEGORY}/${PN}"
- else
- ewarn "Implicitly enabling USE=${curr} for ${CATEGORY}/${PN}"
- fi
- fi
- required-use-warn_internal "${rest}"
- return 0
- fi
- second=${rest#'( '}
- [ "${second}" != "${rest}" ] || die "no opening brace after ${first}"
- rest=${second}
- pass=
- open=1
- while :; do
- second=${rest%%' '[()]*}
- [ "${second}" != "${rest}" ] || die "wrong bracing after ${first}"
- pass=${pass}${second}
- brace=${rest#"${second}"}
- rest=${brace#' '?}
- case ${brace} in
- ' ('*)
- pass=${pass}' ('
- : $(( ++open ));;
- ' )'*)
- : $(( --open ))
- [ $open -eq 0 ] && break
- pass=${pass}' )'
- esac
- done
- ! ${satisfied} || required-use-warn_internal "${pass}"
- rest=${rest#' '}
- required-use-warn_internal "${rest}"
-}
-
-# @FUNCTION: required-use-warn
-# @USAGE: [string]
-# @INTERNAL
-# @DESCRIPTION:
-# Print warnings according to the passed string (default is REQUIRED_USE_WARN)
-required-use-warn() {
- local normalized i
- if [ ${#} -eq 0 ]; then
- normalized=${REQUIRED_USE_WARN}
- else
- normalized=${1}
- fi
- normalized=${normalized//[[:space:]]/' '}
- while i=${normalized//' '/' '} && [ "${i}" != "${normalized}" ]; do
- normalized=${i}
- done
- normalized=${normalized%' '}
- normalized=${normalized#' '}
- required-use-warn_internal "${normalized}"
-}
diff --git a/games-action/trackballs/Manifest b/games-action/trackballs/Manifest
deleted file mode 100644
index 8ef75b0b..00000000
--- a/games-action/trackballs/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST trackballs-1.1.4.tar.gz 7229541 SHA512 f8286a08feab04007bf83e41b8c3669a44ebe2e4fe769a4feb74f26edf469024b6219e7d5825d3a659f2ab209b8a78d574808d71dd2947b49e1ae2323cd0e56c
-DIST trackballs-music-1.4.tar.bz2 18825033 SHA512 f77419a6716fa4d3469cb1817d7d7d492caf556d9e66003690bb7ce2bcd07e25d74dc6b05f210b7e3e9f05acd0a4f2fbc4083e508137933f80bf702937308699
diff --git a/games-action/trackballs/files/trackballs-1.1.4-warning.patch b/games-action/trackballs/files/trackballs-1.1.4-warning.patch
deleted file mode 100644
index c4e21582..00000000
--- a/games-action/trackballs/files/trackballs-1.1.4-warning.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ru trackballs-1.1.4.orig/src/glHelp.cc trackballs-1.1.4/src/glHelp.cc
---- trackballs-1.1.4.orig/src/glHelp.cc 2007-04-07 09:15:09.000000000 -0400
-+++ trackballs-1.1.4/src/glHelp.cc 2011-04-12 12:04:01.142847026 -0400
-@@ -741,29 +741,6 @@
- }
- }
-
--/* C <- A(B) */
--void useMatrix(Matrix4d A,const double B[3],double C[3]) {
-- int i,k;
-- for(i=0;i<3;i++) {
-- C[i] = A[i][3];
-- for(k=0;k<3;k++)
-- C[i] += A[i][k] * B[k];
-- }
-- double h=A[3][3];
-- for(k=0;k<3;k++) h+=A[3][k];
-- for(k=0;k<3;k++) C[k] /= h;
--}
--
--/* C <- A(B) */
--void useMatrix(Matrix3d A,const double B[3],double C[3]) {
-- int i,k;
-- for(i=0;i<3;i++) {
-- C[i] = A[i][3];
-- for(k=0;k<3;k++)
-- C[i] += A[i][k] * B[k];
-- }
--}
--
- /* C <- A */
- void assign(const Matrix4d A,Matrix4d C) {
- int i,j;
-diff -ru trackballs-1.1.4.orig/src/glHelp.h trackballs-1.1.4/src/glHelp.h
---- trackballs-1.1.4.orig/src/glHelp.h 2006-08-05 11:22:32.000000000 -0400
-+++ trackballs-1.1.4/src/glHelp.h 2011-04-12 12:04:16.689745593 -0400
-@@ -57,8 +57,6 @@
- void zero(double[3]);
-
- void debugMatrix(Matrix4d);
--void useMatrix(Matrix4d,const double[3],double[3]);
--void useMatrix(Matrix3d,const double[3],double[3]);
- void identityMatrix(Matrix4d);
- void assign(const Matrix4d,Matrix4d);
- void matrixMult(Matrix4d,Matrix4d,Matrix4d);
diff --git a/games-action/trackballs/trackballs-1.1.4-r1.ebuild b/games-action/trackballs/trackballs-1.1.4-r1.ebuild
deleted file mode 100644
index 82be4a34..00000000
--- a/games-action/trackballs/trackballs-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2016-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop user
-RESTRICT="mirror"
-
-DESCRIPTION="simple game similar to the classical game Marble Madness"
-HOMEPAGE="http://trackballs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://sourceforge/${PN}/${PN}-music-1.4.tar.bz2"
-
-LICENSE="GPL-2 FML-1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="nls"
-
-RDEPEND="virtual/opengl
- virtual/glu
- media-libs/libsdl[sound,joystick,video]
- >=dev-scheme/guile-1.8:12[deprecated]
- media-libs/sdl-mixer
- media-libs/sdl-image
- media-libs/sdl-ttf
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-pkg_setup(){
- enewgroup gamestat 36
-}
-
-src_prepare() {
- sed -i \
- -e 's/icons //' \
- -e 's/games/gamestat/' \
- share/Makefile.in \
- || die
- sed -i \
- -e '/^localedir/s:=.*:=/usr/share/locale:' \
- src/Makefile.in \
- po/Makefile.in.in \
- || die
- # Fix _FORTIFY_SOURCE buffer overflow due to wrong sizeof
- sed -i \
- -e 's/\(snprintf(\(name\),sizeof\)(str)/\1(\2)/' \
- src/enterHighScoreMode.cc || die
- # Fix -Wformat-security warning due to non-literal with no format arguments
- sed -i \
- -e 's/\(snprintf(levelname,sizeof(levelname),\)\(name)\)/\1 "%s", \2/' \
- -e 's/\(snprintf(Settings::settings->specialLevel,sizeof(Settings::settings->specialLevel),\)\(levelname)\)/\1 "%s", \2/' \
- src/editMode.cc || die
- sed -i \
- -e 's/\(snprintf(\(textureName\),\)63\(,textureNames\[i\])\)/\1 sizeof(\2), "%s"\3/' \
- src/map.cc || die
- eapply "${FILESDIR}"/${P}-warning.patch
- default
-}
-
-src_configure() {
- econf \
- --datadir=/usr/share/games \
- --datarootdir=/usr/share \
- --disable-dependency-tracking \
- --with-highscores=/var/games/${PN}.score \
- $(use_enable nls)
-}
-
-src_install() {
- make DESTDIR="${D}" install
- insinto /usr/share/games/${PN}/music
- doins "${WORKDIR}"/trackballs-music/*.ogg
- newicon share/icons/${PN}-64x64.png ${PN}.png
- make_desktop_entry ${PN} Trackballs
- dodoc AUTHORS ChangeLog FAQ NEWS README TODO
- fowners root:gamestat /usr/bin/${PN}
- fperms 2755 /usr/bin/${PN}
-}
diff --git a/games-board/chessproblem/Manifest b/games-board/chessproblem/Manifest
deleted file mode 100644
index 5b158df8..00000000
--- a/games-board/chessproblem/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST chessproblem-1.10.tar.gz 39001 SHA512 64d59668ff63b8e87a359aaa9aabe8d7a098473057a00e8f40caef1543454526a7bdf1e163df001ada703c4f60eb31d06294dd6ece7beaf0e498afe57b0a47d5
-DIST chessproblem-2.13.tar.gz 43677 SHA512 e0c1ff7cd5ec4ddb5cdeb2e8aab84c98264ff228ca0c05304321211b61d21a312d824212884654f91889074ced5b1f5eb2ea3291d4a8d97980dc81f727f8d5a2
diff --git a/games-board/chessproblem/chessproblem-1.10.ebuild b/games-board/chessproblem/chessproblem-1.10.ebuild
deleted file mode 100644
index fc3e3ffb..00000000
--- a/games-board/chessproblem/chessproblem-1.10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2017-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-WANT_LIBTOOL=none
-AT_NOELIBTOOLIZE=yes
-inherit autotools
-
-DESCRIPTION="Find solutions of chess problems (mate, selfmate, and helpmate) with cooks"
-HOMEPAGE="https://github.com/vaeth/chessproblem/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="nothreads"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug optimization strong-optimization"
-
-src_prepare() {
- use prefix || sed -i \
- -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
- -- contrib/test.pl || die
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable debug debugging) \
- $(use_enable optimization) \
- $(use_enable strong-optimization)
-}
-
-src_install() {
- default
- mv -- "${ED}/usr/bin/chessproblem"{,-nothreads}
- exeinto "/usr/share/doc/${PF}/"
- doexe contrib/test.pl
- docompress -x "/usr/share/doc/${PF}/test.pl"
-}
diff --git a/games-board/chessproblem/chessproblem-2.13.ebuild b/games-board/chessproblem/chessproblem-2.13.ebuild
deleted file mode 100644
index 3610f160..00000000
--- a/games-board/chessproblem/chessproblem-2.13.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2017-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-WANT_LIBTOOL=none
-AT_NOELIBTOOLIZE=yes
-inherit autotools
-
-DESCRIPTION="Find solutions of chess problems (mate, selfmate, and helpmate) with cooks"
-HOMEPAGE="https://github.com/vaeth/chessproblem/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="debug +multithreading optimization propagate-signal strong-optimization unlimited"
-
-DEPEND="dev-libs/osformat"
-RDEPEND=$DEPEND
-
-src_prepare() {
- use prefix || sed -i \
- -e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
- -- contrib/test.pl || die
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with multithreading) \
- $(use_enable propagate-signal) \
- $(use_enable unlimited) \
- $(use_enable debug debugging) \
- $(use_enable optimization) \
- $(use_enable strong-optimization)
-}
-
-src_install() {
- default
- exeinto "/usr/share/doc/${PF}/"
- doexe contrib/test.pl
- docompress -x "/usr/share/doc/${PF}/test.pl"
-}
diff --git a/games-board/chessproblem/metadata.xml b/games-board/chessproblem/metadata.xml
deleted file mode 100644
index 528cbe9d..00000000
--- a/games-board/chessproblem/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <bugs-to>mailto:martin@mvath.de</bugs-to>
- <remote-id type="github">vaeth/chessproblem</remote-id>
- </upstream>
- <use>
- <flag name="debug">Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.</flag>
- <flag name="multithreading">Install multithreading version</flag>
- <flag name="optimization">Accept upstream's choices for CXXFLAGS/LDFLAGS for optimization. Absense of this USE flag does not strip user's *FLAGS</flag>
- <flag name="propagate-signal">Use signal propagation for thread pruning. Requires more memory; it is faster in some cases, but slower in others</flag>
- <flag name="strong-optimization">Adds several more agressive CXXFLAGS/LDFLAGS for optimization like graphite (if available). May cause trouble with some buggy compiler versions. Absense of this USE flag does not strip user's *FLAGS</flag>
- <flag name="unlimited">Do not limit number of threads by hardware_concurrency. Useful only for debugging</flag>
- </use>
-</pkgmetadata>
diff --git a/games-emulation/sdlmame/Manifest b/games-emulation/sdlmame/Manifest
deleted file mode 100644
index c58d10af..00000000
--- a/games-emulation/sdlmame/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mame-0.174.zip 95944685 SHA512 9db4d98fb5f5373529808f3bc41fddefa65ebbf7c26d946ebf886cab25e5abf7c4d539d96dfd6af5e62f4366b2bb0b0b59d40fe7a722698f3707eb8ea4c12a0b
diff --git a/games-emulation/sdlmame/files/sdlmame-0.174-cxx14.patch b/games-emulation/sdlmame/files/sdlmame-0.174-cxx14.patch
deleted file mode 100644
index bd88cb47..00000000
--- a/games-emulation/sdlmame/files/sdlmame-0.174-cxx14.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# work around gcc-4.9.3's implementation of cxx14
-# bug 582576 with patch from Alexander Miller
-# https://bugs.gentoo.org/show_bug.cgi?id=582576
-
---- a/src/lib/util/strformat.h
-+++ b/src/lib/util/strformat.h
-@@ -185,9 +185,8 @@
- #include <type_traits>
- #include <utility>
-
--#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20150413)
--namespace std
--{
-+namespace std {
-+namespace mame_cxx14_compat {
- template<class _Container>
- inline constexpr auto
- cbegin(const _Container& __cont) noexcept(noexcept(std::begin(__cont)))-> decltype(std::begin(__cont))
-@@ -198,7 +197,8 @@
- cend(const _Container& __cont) noexcept(noexcept(std::end(__cont)))-> decltype(std::end(__cont))
- { return std::end(__cont); }
- }
--#endif
-+using namespace mame_cxx14_compat;
-+}
-
- namespace util {
- namespace detail {
diff --git a/games-emulation/sdlmame/files/sdlmame-0.174-qt.patch b/games-emulation/sdlmame/files/sdlmame-0.174-qt.patch
deleted file mode 100644
index 5de00e1f..00000000
--- a/games-emulation/sdlmame/files/sdlmame-0.174-qt.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-No point in adding qt-related things to the compile line unless the qt debugger is wanted
-
---- 1/scripts/src/osd/sdl_cfg.lua.orig
-+++ 2/scripts/src/osd/sdl_cfg.lua
-@@ -115,14 +115,16 @@
- configuration { }
-
- elseif _OPTIONS["targetos"]=="linux" then
-- if _OPTIONS["QT_HOME"]~=nil then
-- buildoptions {
-- "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
-- }
-- else
-- buildoptions {
-- backtick("pkg-config --cflags Qt5Widgets"),
-- }
-+ if _OPTIONS["USE_QTDEBUG"]=="1" then
-+ if _OPTIONS["QT_HOME"]~=nil then
-+ buildoptions {
-+ "-I" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_HEADERS"),
-+ }
-+ else
-+ buildoptions {
-+ backtick("pkg-config --cflags Qt5Widgets"),
-+ }
-+ end
- end
- elseif _OPTIONS["targetos"]=="macosx" then
- defines {
diff --git a/games-emulation/sdlmame/files/sdlmame-0.174-sdlSetWindow.patch b/games-emulation/sdlmame/files/sdlmame-0.174-sdlSetWindow.patch
deleted file mode 100644
index ee9a7ca0..00000000
--- a/games-emulation/sdlmame/files/sdlmame-0.174-sdlSetWindow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/634662
-Author of patch: Rick Harris
---- a/3rdparty/bgfx/include/bgfx/bgfxplatform.h
-+++ b/3rdparty/bgfx/include/bgfx/bgfxplatform.h
-@@ -253,7 +253,7 @@
-
- #endif // BX_PLATFORM_
-
--#if defined(_SDL_syswm_h)
-+#if defined(_SDL_syswm_h) || defined(SDL_syswm_h_)
- // If SDL_syswm.h is included before bgfxplatform.h we can enable SDL window
- // interop convenience code.
-
diff --git a/games-emulation/sdlmame/files/sdlmame-0.174-string.patch b/games-emulation/sdlmame/files/sdlmame-0.174-string.patch
deleted file mode 100644
index 85077265..00000000
--- a/games-emulation/sdlmame/files/sdlmame-0.174-string.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 1/src/osd/modules/render/bgfx/effect.h
-+++ 1/src/osd/modules/render/bgfx/effect.h
-@@ -15,6 +15,7 @@
-
- #include <vector>
- #include <map>
-+#include <string>
-
- class bgfx_uniform;
-
diff --git a/games-emulation/sdlmame/files/sdlmame-0.174-tostring.patch b/games-emulation/sdlmame/files/sdlmame-0.174-tostring.patch
deleted file mode 100644
index 431856ac..00000000
--- a/games-emulation/sdlmame/files/sdlmame-0.174-tostring.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 1/scripts/build/msgfmt.py
-+++ 1/scripts/build/msgfmt.py
-@@ -112,7 +112,7 @@
- 7*4, # start of key index
- 7*4+len(keys)*8, # start of value index
- 0, 0) # size and offset of hash table
-- output += array.array("i", offsets).tostring()
-+ output += array.array("i", offsets).tobytes()
- output += ids
- output += strs
- return output
diff --git a/games-emulation/sdlmame/files/vector.ini b/games-emulation/sdlmame/files/vector.ini
deleted file mode 100644
index d4906e34..00000000
--- a/games-emulation/sdlmame/files/vector.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Specific options file for vector games
-#
-
-#
-# VIDEO OPTIONS
-#
-video soft
-yuvmode yv12
diff --git a/games-emulation/sdlmame/metadata.xml b/games-emulation/sdlmame/metadata.xml
deleted file mode 100644
index 86abf710..00000000
--- a/games-emulation/sdlmame/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
- </maintainer>
- <longdescription>
-SDLMAME is a port of the popular MAME[tm]. There are a few principles that guide it's development:
-
-1) run on Linux/Unix, Mac OS X, and other SDL supported operating systems with as few changes as
-possible to the base Win32 code. This means we can track changes faster than larger more conventional
-ports such as MacMAME, and we also maintain what I call "Firefox compatibilty" where learning a major
-app only needs to be done once per application, and it then applies across many operating systems. If
-you can use the command-line Win32 MAME, you already know how to use SDLMAME on any platform you may
-encounter it on.
-
-2) MAME developers are important. By keeping quickly up to date, we make it easy for people on
-non-Windows platforms to make and submit changes to the core MAME code, and we offer native
-implementations of MAME's multi-window GUI debugger on both Linux/Unix and Mac OS X.
- </longdescription>
- <use>
- <flag name="arcade">Enable the Multiple Arcade Machine Emulator for arcade games support</flag>
- <flag name="tools">Build development tools shared between sdlmame and sdlmess</flag>
- <flag name="mess">Enable the Multi Emulator Super System for game system support</flag>
- </use>
- <upstream>
- <remote-id type="github">mamedev/mame</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/games-emulation/sdlmame/sdlmame-0.174-r2.ebuild b/games-emulation/sdlmame/sdlmame-0.174-r2.ebuild
deleted file mode 100644
index 8c3ae6a8..00000000
--- a/games-emulation/sdlmame/sdlmame-0.174-r2.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit python-any-r1 toolchain-funcs qmake-utils
-
-MY_PV="${PV/.}"
-
-DESCRIPTION="Multiple Arcade Machine Emulator + Multi Emulator Super System (MESS)"
-HOMEPAGE="http://mamedev.org/"
-SRC_URI="https://github.com/mamedev/mame/releases/download/mame${MY_PV}/mame${MY_PV}s.zip -> mame-${PV}.zip"
-
-LICENSE="GPL-2+ BSD-2 MIT CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa +arcade debug +mess opengl openmp tools"
-REQUIRED_USE="|| ( arcade mess )"
-
-: ${GAMES_SYSCONFDIR:=/etc}
-: ${GAMES_BINDIR:=/usr/bin}
-: ${GAMES_DATADIR:=/usr/share}
-
-# MESS (games-emulation/sdlmess) has been merged into MAME upstream since mame-0.162 (see below)
-# MAME/MESS build combined (default) +arcade +mess (mame)
-# MAME build only +arcade -mess (mamearcade)
-# MESS build only -arcade +mess (mess)
-# games-emulation/sdlmametools is dropped and enabled instead by the 'tools' useflag
-RDEPEND="!games-emulation/sdlmametools
- !games-emulation/sdlmess
- dev-db/sqlite:3
- dev-libs/expat
- media-libs/fontconfig
- media-libs/flac
- media-libs/libsdl2[joystick,opengl?,sound,video,X]
- media-libs/portaudio
- media-libs/sdl2-ttf
- sys-libs/zlib
- virtual/jpeg:0
- virtual/opengl
- alsa? ( media-libs/alsa-lib
- media-libs/portmidi )
- debug? ( dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5 )
- x11-libs/libX11
- x11-libs/libXinerama"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
- app-arch/unzip
- virtual/pkgconfig
- x11-base/xorg-proto"
-
-S=${WORKDIR}
-
-# Function to disable a makefile option
-disable_feature() {
- sed -i -e "/^[ ]*$1.*=/s:^:# :" makefile || die
-}
-
-# Function to enable a makefile option
-enable_feature() {
- sed -i -e "/^#.*$1.*=/s:^#[ ]*::" makefile || die
-}
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_unpack() {
- default
- unpack ./mame.zip
- rm -f mame.zip || die
-}
-
-src_prepare() {
- eapply \
- "${FILESDIR}"/${P}-qt.patch \
- "${FILESDIR}"/${P}-cxx14.patch \
- "${FILESDIR}"/${P}-string.patch \
- "${FILESDIR}"/${P}-tostring.patch \
- "${FILESDIR}"/${P}-sdlSetWindow.patch
- # Disable using bundled libraries
- enable_feature USE_SYSTEM_LIB_EXPAT
- enable_feature USE_SYSTEM_LIB_FLAC
- enable_feature USE_SYSTEM_LIB_JPEG
-# Use bundled lua for now to ensure correct compilation (ref. b.g.o #407091)
-# enable_feature USE_SYSTEM_LIB_LUA
- enable_feature USE_SYSTEM_LIB_PORTAUDIO
- enable_feature USE_SYSTEM_LIB_SQLITE3
- enable_feature USE_SYSTEM_LIB_ZLIB
-
- # Disable warnings being treated as errors and enable verbose build output
- enable_feature NOWERROR
- enable_feature VERBOSE
-
- use amd64 && enable_feature PTR64
- use debug && enable_feature DEBUG
- use tools && enable_feature TOOLS
- disable_feature NO_X11 # bgfx needs X
- use openmp && enable_feature OPENMP
-
- if use alsa ; then
- enable_feature USE_SYSTEM_LIB_PORTMIDI
- else
- enable_feature NO_USE_MIDI
- fi
-
- sed -i \
- -e 's/-Os//' \
- -e '/^\(CC\|CXX\|AR\) /s/=/?=/' \
- 3rdparty/genie/build/gmake.linux/genie.make || die
- default
-}
-
-src_compile() {
- local targetargs
- local qtdebug=$(usex debug 1 0)
-
- use arcade && ! use mess && targetargs="SUBTARGET=arcade"
- ! use arcade && use mess && targetargs="SUBTARGET=mess"
-
- function my_emake() {
- # Workaround conflicting $ARCH variable used by both Gentoo's
- # portage and by Mame's build scripts
- PYTHON_EXECUTABLE=${PYTHON} \
- OVERRIDE_CC=$(tc-getCC) \
- OVERRIDE_CXX=$(tc-getCXX) \
- OVERRIDE_LD=$(tc-getCXX) \
- QT_HOME="$(qt5_get_libdir)/qt5" \
- ARCH= \
- emake "$@" \
- AR=$(tc-getAR)
- }
- my_emake -j1 generate
-
- my_emake ${targetargs} \
- SDL_INI_PATH="\$\$\$\$HOME/.sdlmame;${GAMES_SYSCONFDIR}/${PN}" \
- USE_QTDEBUG=${qtdebug}
-
- if use tools ; then
- my_emake -j1 TARGET=ldplayer USE_QTDEBUG=${qtdebug}
- fi
-}
-
-src_install() {
- local MAMEBIN
- local suffix="$(use amd64 && echo 64)$(use debug && echo d)"
- local f
-
- function mess_install() {
- dosym ${MAMEBIN} "${GAMES_BINDIR}"/mess${suffix}
- dosym ${MAMEBIN} "${GAMES_BINDIR}"/sdlmess
- newman docs/man/mess.6 sdlmess.6
- doman docs/man/mess.6
- }
- if use arcade ; then
- if use mess ; then
- MAMEBIN="mame${suffix}"
- mess_install
- else
- MAMEBIN="mamearcade${suffix}"
- fi
- doman docs/man/mame.6
- newman docs/man/mame.6 ${PN}.6
- elif use mess ; then
- MAMEBIN="mess${suffix}"
- mess_install
- fi
- dobin ${MAMEBIN}
- dosym ${MAMEBIN} "${GAMES_BINDIR}/${PN}"
-
- insinto "${GAMES_DATADIR}/${PN}"
- doins -r keymaps $(use mess && echo hash)
-
- # Create default mame.ini and inject Gentoo settings into it
- # Note that '~' does not work and '$HOME' must be used
- ./${MAMEBIN} -noreadconfig -showconfig > "${T}/mame.ini" || die
- # -- Paths --
- for f in {rom,hash,sample,art,font,crosshair} ; do
- sed -i \
- -e "s:\(${f}path\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2;${GAMES_DATADIR}/${PN}/\2:" \
- "${T}/mame.ini" || die
- done
- for f in {ctrlr,cheat} ; do
- sed -i \
- -e "s:\(${f}path\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2;${GAMES_SYSCONFDIR}/${PN}/\2;${GAMES_DATADIR}/${PN}/\2:" \
- "${T}/mame.ini" || die
- done
- # -- Directories
- for f in {cfg,nvram,memcard,input,state,snapshot,diff,comment} ; do
- sed -i \
- -e "s:\(${f}_directory\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2:" \
- "${T}/mame.ini" || die
- done
- # -- Keymaps --
- sed -i \
- -e "s:\(keymap_file\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2:" \
- "${T}/mame.ini" || die
- for f in keymaps/km*.map ; do
- sed -i \
- -e "/^keymap_file/a \#keymap_file \t\t${GAMES_DATADIR}/${PN}/keymaps/${f##*/}" \
- "${T}/mame.ini" || die
- done
- insinto "${GAMES_SYSCONFDIR}/${PN}"
- doins "${T}/mame.ini"
-
- insinto "${GAMES_SYSCONFDIR}/${PN}"
- doins "${FILESDIR}/vector.ini"
-
- dodoc docs/{config,mame,newvideo}.txt
- keepdir \
- "${GAMES_DATADIR}/${PN}"/{ctrlr,cheat,roms,samples,artwork,crosshair} \
- "${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheat}
-
- if use tools ; then
- for f in castool chdman floptool imgtool jedutil ldresample ldverify romcmp ; do
- newbin ${f} ${PN}-${f}
- newman docs/man/${f}.1 ${PN}-${f}.1
- done
- newbin ldplayer${suffix} ${PN}-ldplayer
- newman docs/man/ldplayer.1 ${PN}-ldplayer.1
- fi
-}
-
-pkg_postinst() {
- elog "It is strongly recommended to change either the system-wide"
- elog " ${GAMES_SYSCONFDIR}/${PN}/mame.ini or use a per-user setup at ~/.${PN}/mame.ini"
- elog
- if use opengl ; then
- elog "You built ${PN} with opengl support and should set"
- elog "\"video\" to \"opengl\" in mame.ini to take advantage of that"
- elog
- elog "For more info see http://wiki.mamedev.org"
- fi
-}
diff --git a/games-emulation/xmame/Manifest b/games-emulation/xmame/Manifest
deleted file mode 100644
index 112563ed..00000000
--- a/games-emulation/xmame/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xmame-0.106.tar.bz2 17117298 SHA512 baf0369793ac0556551e0c548d5e7960eec375600d48b7921b6c1fa8836cdfec263c173e89f348135e9cbccd3d2a9c227201003e942132db2998b55e282b31d8
diff --git a/games-emulation/xmame/files/fix-zn1-looping-sound.patch b/games-emulation/xmame/files/fix-zn1-looping-sound.patch
deleted file mode 100644
index 2bd051a0..00000000
--- a/games-emulation/xmame/files/fix-zn1-looping-sound.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-# backport fix for looping sounds in the ZN-1
-# by https://github.com/Francesco149/
-diff --git a/src/sound/psx.c b/src/sound/psx.c
-index aa887e2..9c86ace 100644
---- a/src/sound/psx.c
-+++ b/src/sound/psx.c
-@@ -63,6 +63,18 @@ struct psxinfo
- UINT16 m_p_n_volumeright[ MAX_CHANNEL ];
- UINT16 m_p_n_pitch[ MAX_CHANNEL ];
- UINT16 m_p_n_address[ MAX_CHANNEL ];
-+ UINT16 m_p_n_envelopestate[ MAX_CHANNEL ];
-+
-+ enum envstate {
-+ e_attack = 0,
-+ e_decay,
-+ e_sustain,
-+ e_sustainEnd,
-+ e_release,
-+ e_releaseend
-+ }
-+ m_envstate;
-+
- UINT16 m_p_n_attackdecaysustain[ MAX_CHANNEL ];
- UINT16 m_p_n_sustainrelease[ MAX_CHANNEL ];
- UINT16 m_p_n_adsrvolume[ MAX_CHANNEL ];
-@@ -139,8 +151,22 @@ static void PSXSPU_update(void *param, stream_sample_t **inputs, stream_sample_t
-
- for( n_channel = 0; n_channel < MAX_CHANNEL; n_channel++ )
- {
-- voll = volume( chip->m_p_n_volumeleft[ n_channel ] );
-- volr = volume( chip->m_p_n_volumeright[ n_channel ] );
-+ /*
-+ * (backport of https://github.com/mamedev/mame/commit/e763f88ea4bcb3eea6fa7bdb38780ae8475e8e7f )
-+ * hack, if the envelope is in release state, silence it
-+ * - the envelopes aren't currently emulated!
-+ * - and this prevents audiable sounds looping forever
-+ */
-+ if( chip->m_p_n_envelopestate[ n_channel ] == e_release )
-+ {
-+ voll = 0;
-+ volr = 0;
-+ }
-+ else
-+ {
-+ voll = volume( chip->m_p_n_volumeleft[ n_channel ] );
-+ volr = volume( chip->m_p_n_volumeright[ n_channel ] );
-+ }
-
- for( n_sample = 0; n_sample < length; n_sample++ )
- {
-@@ -331,6 +357,7 @@ static void *psxspu_start(int sndindex, int clock, const void *config)
- state_save_register_item_array( "psx", sndindex, chip->m_p_n_volumeright );
- state_save_register_item_array( "psx", sndindex, chip->m_p_n_pitch );
- state_save_register_item_array( "psx", sndindex, chip->m_p_n_address );
-+ state_save_register_item_array( "psx", sndindex, chip->m_p_n_envelopestate );
- state_save_register_item_array( "psx", sndindex, chip->m_p_n_attackdecaysustain );
- state_save_register_item_array( "psx", sndindex, chip->m_p_n_sustainrelease );
- state_save_register_item_array( "psx", sndindex, chip->m_p_n_adsrvolume );
-@@ -539,6 +566,7 @@ WRITE32_HANDLER( psx_spu_w )
- chip->m_p_n_s1[ n_channel ] = 0;
- chip->m_p_n_s2[ n_channel ] = 0;
- chip->m_p_n_blockstatus[ n_channel ] = 1;
-+ chip->m_p_n_envelopestate[ n_channel ] = e_attack;
- }
- }
- break;
-@@ -546,6 +574,16 @@ WRITE32_HANDLER( psx_spu_w )
- chip->m_n_voiceoff = 0;
- COMBINE_DATA( &chip->m_n_voiceoff );
- verboselog( 1, "psx_spu_w() voice off = %08x\n", chip->m_n_voiceoff );
-+
-+ for( n_channel = 0; n_channel < 32; n_channel++ )
-+ {
-+ if( ( chip->m_n_voiceoff & ( 1 << n_channel ) ) != 0 )
-+ {
-+ /* keyoff advances the envelope to release state */
-+ if( chip->m_p_n_envelopestate[ n_channel ] < e_release )
-+ chip->m_p_n_envelopestate[ n_channel ] = e_release;
-+ }
-+ }
- break;
- case SPU_REG( 0xd90 ):
- COMBINE_DATA( &chip->m_n_modulationmode );
diff --git a/games-emulation/xmame/metadata.xml b/games-emulation/xmame/metadata.xml
deleted file mode 100644
index e29607b8..00000000
--- a/games-emulation/xmame/metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <longdescription>
-Mame is an arcade machine emulator. Started in 1997 by Nicola Salmoria, mame started out as a
-series of emulators for individual games. This series of emulators was combined into a simgle
-multi-game emulator. This is the current form of mame; no longer a one-man show, there are over 100
-contributors to the project.
-
-Mame was created by Nicola Salmoria.
-
-Mess is just like mame---a virtual machine emulator, only it doesn't emulate arcade machines but
-rather computers and consoles.
-
-Xmame/xmess are the Unix/X11 ports of the mame and mess projects. It makes mame/mess available on
-*ix machines using the X11R6 X-Window System (and SVGAlib/ggi/XF86-DGA/OpenGL/SDL too).
-
-Mame was orginally ported by Allard Van Der Bas, Dick the Ridder, Juan Antonio Martinez, and Hans
-de Goede.
-
-Xmame/xmess is currently maintained by Lawrence Gold.
-
-Xmame/xmess is based on the mame/mess source code. Due to technical reasons beyond the scope of
-this document, the mame/mess source may not compile under Unix. That's why the xmame/xmess project
-exists. Each time mame/mess is updated, the code is tested (and patched if needed) under Unix. This
-way xmame/xmess releases are always the same as their mame counterparts.
-
-There are no plans for the independent development of xmame/xmess.
-</longdescription>
- <use>
- <flag name="net">Add network support</flag>
- <flag name="bundled-libs">Use bundled version of dev-libs/expat</flag>
- </use>
-</pkgmetadata>
diff --git a/games-emulation/xmame/xmame-0.106-r4.ebuild b/games-emulation/xmame/xmame-0.106-r4.ebuild
deleted file mode 100644
index 01658ed4..00000000
--- a/games-emulation/xmame/xmame-0.106-r4.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-RESTRICT="mirror"
-
-TARGET="${PN}"
-
-DESCRIPTION="Multiple Arcade Machine Emulator for X11"
-HOMEPAGE="http://x.mame.net/"
-SRC_URI="http://gentoo.osuosl.org/distfiles/xmame-${PV}.tar.bz2"
-
-LICENSE="XMAME"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE="alsa bundled-libs cpu_flags_x86_mmx dga ggi joystick lirc net opengl sdl svga X xinerama xv"
-
-RDEPEND="
- alsa? ( media-libs/alsa-lib )
- dga? (
- x11-libs/libXxf86dga
- x11-libs/libXxf86vm )
- !bundled-libs? ( dev-libs/expat )
- ggi? ( media-libs/libggi )
- lirc? ( app-misc/lirc )
- opengl? (
- virtual/opengl
- virtual/glu )
- sdl? ( >=media-libs/libsdl-1.2.0 )
- svga? ( media-libs/svgalib )
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )
- X? ( x11-libs/libXext )"
-DEPEND="${RDEPEND}"
-BDEPEND="x86? ( dev-lang/nasm )
- x11-base/xorg-proto"
-# Icc sucks. bug #41342
-# icc? ( dev-lang/icc )
-
-S=${WORKDIR}/xmame-${PV}
-PATCHES=( "${FILESDIR}/fix-zn1-looping-sound.patch" )
-
-toggle_feature() {
- if use $1 ; then
- sed -i \
- -e "/$2.*=/s:#::" Makefile \
- || die "sed Makefile ($1 / $2) failed"
- fi
-}
-
-toggle_feature2() {
- use $1 && toggle_feature $2 $3
-}
-
-src_prepare() {
- local mycpu
-
- case ${ARCH} in
- x86) mycpu="i386";;
- ia64) mycpu="ia64";;
- amd64) mycpu="amd64";;
- ppc) mycpu="risc";;
- sparc) mycpu="risc";;
- hppa) mycpu="risc";;
- alpha) mycpu="alpha";;
- mips) mycpu="mips";;
- esac
-
- sed -i \
- -e "/^PREFIX/s:=.*:=/usr:" \
- -e "/^MY_CPU/s:i386:${mycpu}:" \
- -e "/^MANDIR/s:man/man:share/man/man:" \
- -e "/^TARGET/s:mame:${TARGET:1}:" \
- -e "/^INSTALL_GROUP/s:bin:root:" \
- -e "/^CFLAGS =/d" \
- -e 's/-s,//' \
- -e 's/-Wl,-s//' \
- -e "/\bCFLAGS +=/d" \
- Makefile \
- || die "sed Makefile failed"
-
- if use ppc ; then
- sed -i \
- -e '/LD.*--relax/s:^# ::' Makefile \
- || die "sed Makefile (ppc/LD) failed"
- fi
-
- if use cpu_flags_x86_mmx ; then
- cat >> src/unix/effect_asm.asm <<EOF
- %ifidn __OUTPUT_FORMAT__,elf
- section .note.GNU-stack noalloc noexec nowrite progbits
- %endif
-EOF
- fi
-
- toggle_feature x86 X86_MIPS3_DRC
- toggle_feature2 x86 cpu_flags_x86_mmx EFFECT_MMX_ASM
- toggle_feature joystick JOY_STANDARD
- toggle_feature2 joystick X XINPUT_DEVICES
- use net && ewarn "Network support is currently (${PV}) broken :("
- #toggle_feature net XMAME_NET # Broken
- #toggle_feature esd SOUND_ESOUND # No esound in portage anymore
- toggle_feature alsa SOUND_ALSA
- #toggle_feature arts SOUND_ARTS # Deprecated
- toggle_feature dga X11_DGA
- toggle_feature xv X11_XV
- # if we don't have expat on the system, use the internal one
- toggle_feature bundled-libs BUILD_EXPAT
- toggle_feature opengl X11_OPENGL
- toggle_feature lirc LIRC
- toggle_feature xinerama X11_XINERAMA
-
- case ${ARCH} in
- x86|ia64|amd64)
- append-flags -Wno-unused -fomit-frame-pointer -fstrict-aliasing -fstrength-reduce
- use amd64 || append-flags -ffast-math #54270
- [[ $(gcc-major-version) -ge 3 ]] \
- && append-flags -falign-functions=2 -falign-jumps=2 -falign-loops=2 \
- || append-flags -malign-functions=2 -malign-jumps=2 -malign-loops=2
- ;;
- ppc)
- append-flags -Wno-unused -funroll-loops -fstrength-reduce -fomit-frame-pointer -ffast-math -fsigned-char
- ;;
- hppa)
- append-flags -ffunction-sections
- ;;
- esac
-
- sed -i \
- -e "s:[Xx]mame:${TARGET}:g" \
- doc/*.6 \
- || die "sed man pages failed"
- # no, we don't want to install setuid (bug #81693)
- sed -i \
- -e 's/^doinstallsuid/notforus/' \
- -e 's/doinstallsuid/doinstall/' \
- -e '/^QUIET/s:^:#:' src/unix/unix.mak \
- || die "sed src/unix/unix.mak failed"
- default
-}
-
-src_compile() {
- local disp=0
- if use sdl ; then
- emake -j1 DISPLAY_METHOD=SDL \
- CC=$(tc-getCC) \
- LD=$(tc-getCC)
- disp=1
- fi
- if use svga ; then
- emake -j1 DISPLAY_METHOD=svgalib \
- CC=$(tc-getCC) \
- LD=$(tc-getCC)
- disp=1
- fi
- if use ggi ; then
- #emake -j1 DISPLAY_METHOD=ggi
- #disp=1
- ewarn "GGI support is currently (${PV}) broken :("
- fi
- if [[ ${disp} -eq 0 ]] || use opengl || use X || use dga || use xv ; then
- emake -j1 DISPLAY_METHOD=x11 \
- CC=$(tc-getCC) \
- LD=$(tc-getCC)
- fi
-}
-
-src_install() {
- local disp=0 f utils="chdman imgtool dat2html romcmp xml2info"
-
- if use sdl ; then
- make DISPLAY_METHOD=SDL PREFIX="${ED}/usr" install \
- || die "install failed (sdl)"
- disp=1
- fi
- if use svga ; then
- make DISPLAY_METHOD=svgalib PREFIX="${ED}/usr" install \
- || die "install failed (svga)"
- disp=1
- fi
- if use ggi ; then
- #make DISPLAY_METHOD=ggi install || die "install failed (ggi)"
- #disp=1
- ewarn "GGI support is currently (${PV}) broken :("
- fi
- if [[ ${disp} -eq 0 ]] || use opengl || use X || use dga || use xv ; then
- make DISPLAY_METHOD=x11 PREFIX="${ED}/usr" install \
- || die "install failed (x11)"
- fi
- exeinto "/usr/$(get_libdir)/${PN}"
- for f in $utils
- do
- if [[ -f "${ED}"/usr/bin/$f ]] ; then
- doexe $f
- rm -f "${ED}"/usr/bin/$f 2>/dev/null
- fi
- done
-
- insinto "/usr/share/${PN}"
- doins -r ctrlr
- dodoc doc/{changes.*,*.txt,mame/*,${TARGET}rc.dist} README todo
- docinto html
- dodoc -r doc/img doc/mess doc/*.html doc/*.css
-
- # default to sdl since the client is a bit more featureful
- if use sdl ; then
- dosym "${TARGET}.SDL" "/usr/bin/${TARGET}"
- elif [[ ${disp} -eq 0 ]] || use opengl || use X || use dga || use xv ; then
- dosym "${TARGET}.x11" "/usr/bin/${TARGET}"
- elif use svga ; then
- dosym ${TARGET}.svgalib "/usr/bin/${TARGET}"
- #elif use ggi ; then
- #dosym ${TARGET}.ggi "/usr/bin/${TARGET}"
- fi
-}
-
-pkg_postinst() {
- elog "Your available MAME binaries are: ${TARGET}"
- if use opengl || use X || use dga || use xv ; then
- elog " ${TARGET}.x11"
- fi
- use sdl && elog " ${TARGET}.SDL"
- #use ggi && elog " ${TARGET}.ggi"
- use svga && elog " ${TARGET}.svgalib"
-
- elog "Helper utilities are located in /usr/$(get_libdir)/${PN}."
-}
diff --git a/games-emulation/xmess/Manifest b/games-emulation/xmess/Manifest
deleted file mode 100644
index 112563ed..00000000
--- a/games-emulation/xmess/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xmame-0.106.tar.bz2 17117298 SHA512 baf0369793ac0556551e0c548d5e7960eec375600d48b7921b6c1fa8836cdfec263c173e89f348135e9cbccd3d2a9c227201003e942132db2998b55e282b31d8
diff --git a/games-emulation/xmess/files/xmess-0.106-overflow.patch b/games-emulation/xmess/files/xmess-0.106-overflow.patch
deleted file mode 100644
index c231c568..00000000
--- a/games-emulation/xmess/files/xmess-0.106-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mess/machine/corvushd.c
-+++ b/mess/machine/corvushd.c
-@@ -243,7 +243,7 @@
- /* */
- struct {
- UINT8 status; /* Status code returned by command executed */
-- UINT8 firmware[32]; /* Firmware message */
-+ UINT8 firmware[33]; /* Firmware message */
- UINT8 rom_version; /* ROM Version */
- struct {
- UINT8 sectors_per_track; /* Sectors/Track */
diff --git a/games-emulation/xmess/metadata.xml b/games-emulation/xmess/metadata.xml
deleted file mode 100644
index e29607b8..00000000
--- a/games-emulation/xmess/metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <longdescription>
-Mame is an arcade machine emulator. Started in 1997 by Nicola Salmoria, mame started out as a
-series of emulators for individual games. This series of emulators was combined into a simgle
-multi-game emulator. This is the current form of mame; no longer a one-man show, there are over 100
-contributors to the project.
-
-Mame was created by Nicola Salmoria.
-
-Mess is just like mame---a virtual machine emulator, only it doesn't emulate arcade machines but
-rather computers and consoles.
-
-Xmame/xmess are the Unix/X11 ports of the mame and mess projects. It makes mame/mess available on
-*ix machines using the X11R6 X-Window System (and SVGAlib/ggi/XF86-DGA/OpenGL/SDL too).
-
-Mame was orginally ported by Allard Van Der Bas, Dick the Ridder, Juan Antonio Martinez, and Hans
-de Goede.
-
-Xmame/xmess is currently maintained by Lawrence Gold.
-
-Xmame/xmess is based on the mame/mess source code. Due to technical reasons beyond the scope of
-this document, the mame/mess source may not compile under Unix. That's why the xmame/xmess project
-exists. Each time mame/mess is updated, the code is tested (and patched if needed) under Unix. This
-way xmame/xmess releases are always the same as their mame counterparts.
-
-There are no plans for the independent development of xmame/xmess.
-</longdescription>
- <use>
- <flag name="net">Add network support</flag>
- <flag name="bundled-libs">Use bundled version of dev-libs/expat</flag>
- </use>
-</pkgmetadata>
diff --git a/games-emulation/xmess/xmess-0.106-r3.ebuild b/games-emulation/xmess/xmess-0.106-r3.ebuild
deleted file mode 100644
index 7ca105c7..00000000
--- a/games-emulation/xmess/xmess-0.106-r3.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-RESTRICT="mirror"
-
-TARGET="${PN}"
-
-DESCRIPTION="Multiple Arcade Machine Emulator for X11"
-HOMEPAGE="http://x.mame.net/"
-SRC_URI="http://gentoo.osuosl.org/distfiles/xmame-${PV}.tar.bz2"
-
-LICENSE="XMAME"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE="alsa bundled-libs cpu_flags_x86_mmx dga ggi joystick lirc net opengl sdl svga X xinerama xv"
-
-RDEPEND="sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- dga? (
- x11-libs/libXxf86dga
- x11-libs/libXxf86vm )
- !bundled-libs? ( dev-libs/expat )
- ggi? ( media-libs/libggi )
- lirc? ( app-misc/lirc )
- opengl? (
- virtual/opengl
- virtual/glu )
- sdl? ( >=media-libs/libsdl-1.2.0 )
- svga? ( media-libs/svgalib )
- xinerama? ( x11-libs/libXinerama )
- xv? ( x11-libs/libXv )
- X? ( x11-libs/libXext )"
-DEPEND="${RDEPEND}"
-BDEPEND="x86? ( dev-lang/nasm )
- x11-base/xorg-proto"
-# Icc sucks. bug #41342
-# icc? ( dev-lang/icc )
-
-S=${WORKDIR}/xmame-${PV}
-PATCHES=("${FILESDIR}"/${P}-overflow.patch)
-
-toggle_feature() {
- if use $1 ; then
- sed -i \
- -e "/$2.*=/s:#::" Makefile \
- || die "sed Makefile ($1 / $2) failed"
- fi
-}
-
-toggle_feature2() {
- use $1 && toggle_feature $2 $3
-}
-
-src_prepare() {
- local mycpu
-
- case ${ARCH} in
- x86) mycpu="i386";;
- ia64) mycpu="ia64";;
- amd64) mycpu="amd64";;
- ppc) mycpu="risc";;
- sparc) mycpu="risc";;
- hppa) mycpu="risc";;
- alpha) mycpu="alpha";;
- mips) mycpu="mips";;
- esac
-
- sed -i \
- -e "/^PREFIX/s:=.*:=/usr:" \
- -e "/^MY_CPU/s:i386:${mycpu}:" \
- -e "/^MANDIR/s:man/man:share/man/man:" \
- -e "/^TARGET/s:mame:${TARGET:1}:" \
- -e "/^INSTALL_GROUP/s:bin:root:" \
- -e "/^CFLAGS =/d" \
- -e 's/-s,//' \
- -e 's/-Wl,-s//' \
- -e "/\bCFLAGS +=/d" \
- Makefile \
- || die "sed Makefile failed"
-
- if use ppc ; then
- sed -i \
- -e '/LD.*--relax/s:^# ::' Makefile \
- || die "sed Makefile (ppc/LD) failed"
- fi
-
- if use cpu_flags_x86_mmx ; then
- cat >> src/unix/effect_asm.asm <<EOF
- %ifidn __OUTPUT_FORMAT__,elf
- section .note.GNU-stack noalloc noexec nowrite progbits
- %endif
-EOF
- fi
-
- toggle_feature x86 X86_MIPS3_DRC
- toggle_feature2 x86 cpu_flags_x86_mmx EFFECT_MMX_ASM
- toggle_feature joystick JOY_STANDARD
- toggle_feature2 joystick X XINPUT_DEVICES
- use net && ewarn "Network support is currently (${PV}) broken :("
- #toggle_feature net XMAME_NET # Broken
- #toggle_feature esd SOUND_ESOUND # No esound in portage anymore
- toggle_feature alsa SOUND_ALSA
- #toggle_feature arts SOUND_ARTS # Deprecated
- toggle_feature dga X11_DGA
- toggle_feature xv X11_XV
- # if we don't have expat on the system, use the internal one
- toggle_feature bundled-libs BUILD_EXPAT
- toggle_feature opengl X11_OPENGL
- toggle_feature lirc LIRC
- toggle_feature xinerama X11_XINERAMA
-
- case ${ARCH} in
- x86|ia64|amd64)
- append-flags -Wno-unused -fomit-frame-pointer -fstrict-aliasing -fstrength-reduce
- use amd64 || append-flags -ffast-math #54270
- [[ $(gcc-major-version) -ge 3 ]] \
- && append-flags -falign-functions=2 -falign-jumps=2 -falign-loops=2 \
- || append-flags -malign-functions=2 -malign-jumps=2 -malign-loops=2
- ;;
- ppc)
- append-flags -Wno-unused -funroll-loops -fstrength-reduce -fomit-frame-pointer -ffast-math -fsigned-char
- ;;
- hppa)
- append-flags -ffunction-sections
- ;;
- esac
-
- sed -i \
- -e "s:[Xx]mame:${TARGET}:g" \
- doc/*.6 \
- || die "sed man pages failed"
- # no, we don't want to install setuid (bug #81693)
- sed -i \
- -e 's/^doinstallsuid/notforus/' \
- -e 's/doinstallsuid/doinstall/' \
- -e '/^QUIET/s:^:#:' src/unix/unix.mak \
- || die "sed src/unix/unix.mak failed"
- default
-}
-
-src_compile() {
- local disp=0
- if use sdl ; then
- emake -j1 DISPLAY_METHOD=SDL \
- CC=$(tc-getCC) \
- LD=$(tc-getCC)
- disp=1
- fi
- if use svga ; then
- emake -j1 DISPLAY_METHOD=svgalib \
- CC=$(tc-getCC) \
- LD=$(tc-getCC)
- disp=1
- fi
- if use ggi ; then
- #emake -j1 DISPLAY_METHOD=ggi
- #disp=1
- ewarn "GGI support is currently (${PV}) broken :("
- fi
- if [[ ${disp} -eq 0 ]] || use opengl || use X || use dga || use xv ; then
- emake -j1 DISPLAY_METHOD=x11 \
- CC=$(tc-getCC) \
- LD=$(tc-getCC)
- fi
-}
-
-src_install() {
- local disp=0 f utils="chdman imgtool dat2html romcmp xml2info"
-
- if use sdl ; then
- make DISPLAY_METHOD=SDL PREFIX="${ED}/usr" install \
- || die "install failed (sdl)"
- disp=1
- fi
- if use svga ; then
- make DISPLAY_METHOD=svgalib PREFIX="${ED}/usr" install \
- || die "install failed (svga)"
- disp=1
- fi
- if use ggi ; then
- #make DISPLAY_METHOD=ggi install || die "install failed (ggi)"
- #disp=1
- ewarn "GGI support is currently (${PV}) broken :("
- fi
- if [[ ${disp} -eq 0 ]] || use opengl || use X || use dga || use xv ; then
- make DISPLAY_METHOD=x11 PREFIX="${ED}/usr" install \
- || die "install failed (x11)"
- fi
- exeinto "/usr/$(get_libdir)/${PN}"
- for f in $utils
- do
- if [[ -f "${ED}"/usr/bin/$f ]] ; then
- doexe $f
- rm -f "${ED}"/usr/bin/$f 2>/dev/null
- fi
- done
-
- insinto "/usr/share/${PN}"
- doins -r ctrlr
- dodoc doc/{changes.*,*.txt,mame/*,${TARGET}rc.dist} README todo
- docinto html
- dodoc -r doc/img doc/mess doc/*.html doc/*.css
-
- # default to sdl since the client is a bit more featureful
- if use sdl ; then
- dosym "${TARGET}.SDL" "/usr/bin/${TARGET}"
- elif [[ ${disp} -eq 0 ]] || use opengl || use X || use dga || use xv ; then
- dosym "${TARGET}.x11" "/usr/bin/${TARGET}"
- elif use svga ; then
- dosym ${TARGET}.svgalib "/usr/bin/${TARGET}"
- #elif use ggi ; then
- #dosym ${TARGET}.ggi "/usr/bin/${TARGET}"
- fi
-}
-
-pkg_postinst() {
- elog "Your available MAME binaries are: ${TARGET}"
- if use opengl || use X || use dga || use xv ; then
- elog " ${TARGET}.x11"
- fi
- use sdl && elog " ${TARGET}.SDL"
- #use ggi && elog " ${TARGET}.ggi"
- use svga && elog " ${TARGET}.svgalib"
-
- elog "Helper utilities are located in /usr/$(get_libdir)/${PN}."
-}
diff --git a/games-engines/freesci/Manifest b/games-engines/freesci/Manifest
deleted file mode 100644
index ad3c3904..00000000
--- a/games-engines/freesci/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST freesci-0.6.4.tar.bz2 1113088 SHA512 af6e31104081953ad2a0f333d13b324a2e2df587081076c3a95b6a0a399a3b9781bf7b7f36af8fa0ad447741b41348c34b2794ee5e864e94bc3a86f8e3676aa1
diff --git a/games-engines/freesci/files/freesci-0.6.4-glibc2.10.patch b/games-engines/freesci/files/freesci-0.6.4-glibc2.10.patch
deleted file mode 100644
index f0ddba8d..00000000
--- a/games-engines/freesci/files/freesci-0.6.4-glibc2.10.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/tools/bdfgname.c
-+++ src/tools/bdfgname.c
-@@ -47,9 +47,9 @@
-
- static int
- #ifdef __STDC__
--getline(FILE *in, char *buf, int limit)
-+get_line(FILE *in, char *buf, int limit)
- #else
--getline(in, buf, limit)
-+get_line(in, buf, limit)
- FILE *in;
- char *buf;
- int limit;
-@@ -99,11 +99,11 @@
-
- while (!feof(in)) {
- pos = ftell(in);
-- (void) getline(in, buf, 256);
-+ (void) get_line(in, buf, 256);
- while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
- buf[0] = 0;
- pos = ftell(in);
-- (void) getline(in, buf, 256);
-+ (void) get_line(in, buf, 256);
- }
-
- if (buf[0] == 0)
-@@ -170,11 +170,11 @@
-
- while (!feof(in)) {
- pos = ftell(in);
-- (void) getline(in, buf, 256);
-+ (void) get_line(in, buf, 256);
- while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
- buf[0] = 0;
- pos = ftell(in);
-- (void) getline(in, buf, 256);
-+ (void) get_line(in, buf, 256);
- }
-
- c = _bdf_atol(buf, 0, 16);
diff --git a/games-engines/freesci/files/inline.patch b/games-engines/freesci/files/inline.patch
deleted file mode 100644
index a7950c8c..00000000
--- a/games-engines/freesci/files/inline.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Martin Väth <martin@mvath.de>:
-Wrong inlines cause symbols/functions not to be found with current gcc-11
---- 1/src/engine/klists.c
-+++ 1/src/engine/klists.c
-@@ -301,7 +301,7 @@
- return make_reg(0, ((l)? IS_NULL_REG(l->first) : 0));
- }
-
--inline void
-+void
- _k_add_to_front(state_t *s, reg_t listbase, reg_t nodebase)
- {
- list_t *l = LOOKUP_LIST(listbase);
-@@ -328,7 +328,7 @@
- l->first = nodebase;
- }
-
--inline void
-+void
- _k_add_to_end(state_t *s, reg_t listbase, reg_t nodebase)
- {
- list_t *l = LOOKUP_LIST(listbase);
---- ori/src/sfx/softseq/fmopl.c
-+++ ori/src/sfx/softseq/fmopl.c
-@@ -443,6 +443,7 @@
- /* operator output calcrator */
- #define OP_OUT(slot,env,con) slot->wavetable[((slot->Cnt + con) / (0x1000000 / SIN_ENT)) & (SIN_ENT-1)][env]
- /* ---------- calcrate one of channel ---------- */
-+void OPL_CALC_CH(OPL_CH *CH);
- INLINE void OPL_CALC_CH(OPL_CH *CH) {
- guint32 env_out;
- OPL_SLOT *SLOT;
-@@ -486,6 +487,7 @@
-
- /* ---------- calcrate rythm block ---------- */
- #define WHITE_NOISE_db 6.0
-+void OPL_CALC_RH(OPL_CH *CH);
- INLINE void OPL_CALC_RH(OPL_CH *CH) {
- guint32 env_tam, env_sd, env_top, env_hh;
- int whitenoise = (int)((rand()&1) * (WHITE_NOISE_db / EG_STEP));
diff --git a/games-engines/freesci/freesci-0.6.4-r2.ebuild b/games-engines/freesci/freesci-0.6.4-r2.ebuild
deleted file mode 100644
index fe1f18c4..00000000
--- a/games-engines/freesci/freesci-0.6.4-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop
-RESTRICT="mirror"
-
-DESCRIPTION="Sierra script interpreter for your old Sierra adventures"
-HOMEPAGE="http://freesci.linuxgames.com/"
-SRC_URI="http://www-plan.cs.colorado.edu/creichen/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="X ggi sdl"
-
-DEPEND="media-libs/alsa-lib
- X? (
- x11-libs/libX11
- x11-libs/libXrender
- x11-libs/libXext
- )
- ggi? ( media-libs/libggi )
- sdl? ( media-libs/libsdl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -i \
- -e "/^SUBDIRS =/s:desktop src conf debian:src:" \
- Makefile.in \
- || die "sed failed"
- eapply -p0 "${FILESDIR}"/${P}-glibc2.10.patch
- eapply "${FILESDIR}"/inline.patch
- default
-}
-
-src_configure() {
- econf \
- --with-Wall \
- --without-directfb \
- $(use_with X x) \
- $(use_with ggi) \
- $(use_with sdl)
-}
-
-src_install() {
- default
- doicon desktop/${PN}.png
- make_desktop_entry ${PN} FreeSCI
-}
diff --git a/games-rpg/aklabeth/Manifest b/games-rpg/aklabeth/Manifest
deleted file mode 100644
index c91ab06a..00000000
--- a/games-rpg/aklabeth/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST aklabeth-1.0.tar.gz 235131 SHA512 cb13d40389c34617686363807fe3cfb20f5c04d88798f807cd497b3839f190c045027483115890f07b84f5947d3acc16953b18567a2783afba854e4227d415de
diff --git a/games-rpg/aklabeth/aklabeth-1.0-r1.ebuild b/games-rpg/aklabeth/aklabeth-1.0-r1.ebuild
deleted file mode 100644
index 6cc54271..00000000
--- a/games-rpg/aklabeth/aklabeth-1.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="A remake of Richard C. Garriott's Ultima prequel"
-HOMEPAGE="http://www.autismuk.freeserve.co.uk/"
-SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl"
-
-src_prepare() {
- eapply -p0 "${FILESDIR}"/${P}-gcc43.patch
- default
-}
-
-src_install() {
- dobin src/aklabeth
- dodoc AUTHORS README NEWS
-}
diff --git a/games-rpg/aklabeth/files/aklabeth-1.0-gcc43.patch b/games-rpg/aklabeth/files/aklabeth-1.0-gcc43.patch
deleted file mode 100644
index b9a32dad..00000000
--- a/games-rpg/aklabeth/files/aklabeth-1.0-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/sdw.hxx
-+++ src/sdw.hxx
-@@ -19,6 +19,7 @@
-
- #include <iostream>
- #include <string>
-+#include <cstdlib>
-
- namespace SDLWrapper // It's all nicely in a namespace SDLWrapper
- {
diff --git a/games-rpg/dsa-stats/Manifest b/games-rpg/dsa-stats/Manifest
deleted file mode 100644
index c5faed31..00000000
--- a/games-rpg/dsa-stats/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dsa-stats-1.1.tar.gz 3798 SHA512 f4f18c907bbecb81059914744b070c21a558ebe6fdd3f8b4f669c1dd6de8322a3f75c8664b7f15b5247690bcfdaa01bb75ed07e062b0f39070ffe7c5f122c7f5
diff --git a/games-rpg/dsa-stats/dsa-stats-1.1.ebuild b/games-rpg/dsa-stats/dsa-stats-1.1.ebuild
deleted file mode 100644
index a5b5e990..00000000
--- a/games-rpg/dsa-stats/dsa-stats-1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2016-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="calculate stat probabalities for the role playing game DSA - Das schwarze Auge"
-HOMEPAGE="https://github.com/vaeth/dsa-stats/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_install() {
- dodoc README.md
- dobin dsa
-}
diff --git a/games-rpg/dsa-stats/metadata.xml b/games-rpg/dsa-stats/metadata.xml
deleted file mode 100644
index 765fddd9..00000000
--- a/games-rpg/dsa-stats/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <bugs-to>mailto:martin@mvath.de</bugs-to>
- <remote-id type="github">vaeth/das-stats</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest
deleted file mode 100644
index f45a2848..00000000
--- a/games-rpg/freedroidrpg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST freedroidRPG-1.0rc2.tar.gz 233852127 BLAKE2B c87c2314d17037873acf4fc24ce20790c9ec40c8f7b1ea27e6ab9c543abb671bc50b3ff5b86900f7111d1f1a899213dcb90529d2e39918801c9cc3a42585f02e SHA512 a79afdb089691dd59b0128f34f7068c69fac8c057a0485bca3275f4914b1c9c0f21cbb9102ecdc99911b70456c078dbdeb8981fd7714836cd9535677bcc4d1e7
diff --git a/games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch b/games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch
deleted file mode 100644
index fd8bc4f9..00000000
--- a/games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Fixes build. https://bugs.gentoo.org/706930#c8
-
---- freedroidrpg-1.0RC2/src/global.h 2019-03-30 23:20:31.000000000 +1000
-+++ freedroidrpg-1.0RC2/src/global.h 2020-06-21 20:51:01.566218463 +1000
-@@ -36,7 +36,6 @@
- #define INTERN_FOR _main_c
- #include "extint_macros.h"
-
--EXTERN float FPSover1;
- EXTERN char *AllSkillTexts[];
- EXTERN char font_switchto_red[];
- EXTERN char font_switchto_blue[];
---- freedroidrpg-1.0RC2/src/lvledit/lvledit_tools.h 2019-03-30 23:20:31.000000000 +1000
-+++ freedroidrpg-1.0RC2/src/lvledit/lvledit_tools.h 2020-06-21 20:41:58.424710693 +1000
-@@ -36,7 +36,7 @@
-
- void leveleditor_init_tools(void);
-
--struct leveleditor_tool tool_place, tool_move, tool_select;
-+EXTERN struct leveleditor_tool tool_place, tool_move, tool_select;
-
- #define EVENT_LEFT_PRESS(e) (((e) && e->type == SDL_MOUSEBUTTONDOWN) && (e->button.button == 1))
- #define EVENT_RIGHT_PRESS(e) (((e) && e->type == SDL_MOUSEBUTTONDOWN) && (e->button.button == 3))
---- freedroidrpg-1.0RC2/src/mapgen/mapgen.h 2019-03-30 23:20:31.000000000 +1000
-+++ freedroidrpg-1.0RC2/src/mapgen/mapgen.h 2020-06-21 20:43:53.255723534 +1000
-@@ -64,9 +64,9 @@
- extern int total_rooms;
-
- // Interface to the game
--void (*dungeonmap_convert) (int, int, unsigned char *);
--void (*dungeonmap_place_enemies) (struct roominfo *);
--void (*dungeonmap_gift) (struct roominfo *);
-+extern void (*dungeonmap_convert) (int, int, unsigned char *);
-+extern void (*dungeonmap_place_enemies) (struct roominfo *);
-+extern void (*dungeonmap_gift) (struct roominfo *);
-
- int generate_dungeon_gram(int, int);
-
---- freedroidrpg-1.0RC2/src/struct.h 2019-05-13 01:03:36.000000000 +1000
-+++ freedroidrpg-1.0RC2/src/struct.h 2020-06-21 20:38:22.189812908 +1000
-@@ -1063,7 +1063,7 @@
- struct tux_part_instances default_instances; // Default part instances
- tux_part_render_motionclass *render_order; // The render_sets of each motion class
- int gun_muzzle_height; // Vertical offset to apply to bullets
--} tux_rendering;
-+};
-
- /**
- * Contains a set of Tux's parts images for a motion class.
diff --git a/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild b/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild
deleted file mode 100644
index 0d83f15d..00000000
--- a/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit autotools flag-o-matic desktop python-any-r1 xdg
-
-MY_PV=$(ver_rs 2 '')
-DESCRIPTION="A modification of the classical Freedroid engine into an RPG"
-HOMEPAGE="http://www.freedroid.org"
-SRC_URI="ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-$(ver_cut 1-2)/freedroidRPG-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug devtools nls opengl profile sanitize sound"
-
-RDEPEND="
- sys-libs/zlib
- virtual/jpeg:0
- media-libs/libpng:0
- media-libs/libsdl[opengl?,sound?,video]
- media-libs/sdl-image[jpeg,png]
- >=media-libs/sdl-gfx-2.0.21
- nls? ( virtual/libintl )
- opengl? ( virtual/opengl )
- sound? (
- media-libs/libogg
- media-libs/libvorbis
- media-libs/sdl-mixer[vorbis] )
- devtools? ( media-libs/sdl-ttf )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- nls? ( sys-devel/gettext )
- sanitize? ( || ( sys-devel/gcc[sanitize] sys-devel/clang-runtime[sanitize] ) )"
-
-S="${WORKDIR}/${PN}-${MY_PV^^}"
-
-PATCHES=(
- "${FILESDIR}/${P}-fnocommon.patch"
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e '/^dist_doc_DATA/d' \
- -e '/-pipe/d' \
- -e '/^SUBDIRS/s/pkgs//' \
- Makefile.am || die
- python_fix_shebang src data/sound
- eautoreconf
-}
-
-src_configure() {
- # this can produce strange results due to 'imprecise' math computations
- filter-flags -ffast-math
-
- local myconf=(
- --disable-fastmath
- --with-embedded-lua
- --localedir="${EPREFIX}/usr/share/locale"
- $(use_enable nls)
- $(use_enable opengl)
- $(use_enable sound)
- $(use_enable debug)
- $(use_with debug extra-warnings)
- $(use_enable debug backtrace)
- $(use_enable sanitize sanitize-address)
- $(use_enable profile rtprof)
- $(use_enable devtools dev-tools)
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- local i
-
- default
- for i in 48 64 96 128
- do
- doicon -s ${i} pkgs/freedesktop/icons/hicolor/${i}x${i}/apps/"${PN}".png
- done
- doicon -s scalable pkgs/freedesktop/icons/hicolor/scalable/apps/freedroidRPG.svg
- make_desktop_entry "${PN}" "Freedroid RPG" "${PN}"
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- local v min="1.0_rc1"
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "${v}" -lt "${min}"; then
- echo
- ewarn "${P} is not compatible with save games before ${min}."
- ewarn "Please start a new character."
- echo
- fi
- done
-}
diff --git a/games-rpg/freedroidrpg/metadata.xml b/games-rpg/freedroidrpg/metadata.xml
deleted file mode 100644
index 01b748c2..00000000
--- a/games-rpg/freedroidrpg/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
- </maintainer>
- <longdescription>
-FreedroidRPG is an open source role playing game
-
-The game tells the story of a world destroyed by a conflict between robots and
-their human masters. Play as Tux in a quest to save the world from the
-murderous rebel bots who know no mercy. You get to choose which path you wish
-to follow, and freedom of choice is everywhere in the game.
-
-FreedroidRPG features a real time combat system with melee and ranged weapons,
-fairly similar to the proprietary game Diablo. There is an innovative system of
-programs that can be run in order to take control of enemy robots, alter their
-behavior, or improve one's characteristics. You can use over 50 different kinds
-of items and fight countless enemies on your way to your destiny. An advanced
-dialog system provides story background and immersive role playing situations.
-
-The game is complete, fully playable, and can provide about 10 hours of fun. It
-is still being actively developed, and help is welcome in many areas. People
-having - or trying to acquire - programming, map editing, or writing skills
-will find FreedroidRPG to be an exciting, fast-moving project in which they can
-fully express their creativity.
-</longdescription>
-<use>
- <flag name="devtools">Compile the additional dev tools</flag>
- <flag name="profile">Enable the integration of the ingame real-time profiler</flag>
- <flag name="sanitize">Compile with address sanitizer</flag>
-</use>
-</pkgmetadata>
diff --git a/games-rpg/m5figur-mv/ChangeLog b/games-rpg/m5figur-mv/ChangeLog
new file mode 100644
index 00000000..0bf9f775
--- /dev/null
+++ b/games-rpg/m5figur-mv/ChangeLog
@@ -0,0 +1,41 @@
+# ChangeLog for games-rpg/m5figur-mv
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*m5figur-mv-2.4 (31 Jul 2015)
+
+ 31 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*m5figur-mv-2.3 (08 Jan 2015)
+
+ 08 Jan 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*m5figur-mv-2.2 (04 Jan 2015)
+
+ 04 Jan 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*m5figur-mv-2.1 (02 Jan 2015)
+
+ 02 Jan 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*m5figur-mv-2.0 (01 Jan 2015)
+
+ 01 Jan 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*m5figur-mv-1.3 (31 Dec 2014)
+
+ 31 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*m5figur-mv-1.1 (24 Jan 2013)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 24 Jan 2013; Martin Väth <martin@mvath.de>:
+ Initial version from scratch
diff --git a/games-rpg/m5figur-mv/Manifest b/games-rpg/m5figur-mv/Manifest
index 920f8f39..b4a5da20 100644
--- a/games-rpg/m5figur-mv/Manifest
+++ b/games-rpg/m5figur-mv/Manifest
@@ -1 +1 @@
-DIST m5figur-mv-4.2.2.tar.gz 28319 SHA512 9d2d788ac26596d50d05b95a29b35bf950729f73b7503f1a6b065f3f5ea95bc9780f4db6d14d954f587a614238d0b86af71c517738dfd4b511b3a8b5642fad47
+DIST m5figur-mv-2.4.tar.gz 19263 SHA256 f01e88d8d05ff780fc9d4d97671dc7cd353df37094ddf5307f85e16e5041ef2e SHA512 2229896d120e78573f0add5c8e14f8d589da6d1cf4dc590f4cbc46e9112bda0926404b68f755d2b9ffb9b846b53eb556c53bc6bc1c45d4c0d5b20088bd5ccd4d WHIRLPOOL 073c6e67dc1e8ca183b5c1aca48dd20c944879193c4dd4f703f298d5e63cd915fcdbba8ce6f334e9ae2aea6179262e4e6815c53d122c00b09c7dd990f73c6c79
diff --git a/games-rpg/m5figur-mv/m5figur-mv-4.2.2.ebuild b/games-rpg/m5figur-mv/m5figur-mv-2.4.ebuild
index c3f4f7a6..068b1bdc 100644
--- a/games-rpg/m5figur-mv/m5figur-mv-4.2.2.ebuild
+++ b/games-rpg/m5figur-mv/m5figur-mv-2.4.ebuild
@@ -1,36 +1,31 @@
-# Copyright 2014-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
# Do *not* inherit latex-package: It DEPENDS unconditionally on texinfo.
# Moreover, it would attempt to compile the *.tex example with texinfo to dvi.
+inherit eutils
RESTRICT="mirror"
DESCRIPTION="LaTeX2e character sheet layout for the Midgard Role Playing Game (Edition M5)"
HOMEPAGE="https://github.com/vaeth/m5figur-mv/"
SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LPPL-1.3c"
+LICENSE="LPPL-1.2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE="+examples"
# We need texlive-latexextra for toolbox.sty
-DEPEND="virtual/latex-base"
-RDEPEND="${DEPEND}
+RDEPEND="virtual/latex-base
dev-texlive/texlive-latexextra"
-BDEPEND="examples? ( ${DEPEND} )"
+DEPEND="examples? ( ${RDEPEND} )"
src_compile() {
- local i j
if use examples
then einfo "Compiling example character sheet as pdf"
export VARTEXFONTS="${T}/fonts"
- for i in *.tex beispiele/*.tex; do
- j=${i##*/}
- pdflatex "${i}" && test -s "${j%.tex}.pdf" \
- || die "could not compile ${i}"
- [ "${j}" = "${i}" ] || mv "${j%.tex}.pdf" "${i%.tex}.pdf" || die
- done
+ pdflatex *.tex && test -s *.pdf || die "could not create example"
fi
}
@@ -40,11 +35,10 @@ src_install() {
doins *.cls
insinto "${TEXMF}/doc/latex/${PN}"
doins *.tex
- doins -r beispiele
if use examples
then doins *.pdf
fi
- dodoc README.md
+ dodoc README
}
pkg_postinst() {
diff --git a/games-rpg/m5figur-mv/metadata.xml b/games-rpg/m5figur-mv/metadata.xml
index 0faea99c..f388f698 100644
--- a/games-rpg/m5figur-mv/metadata.xml
+++ b/games-rpg/m5figur-mv/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/games-rpg/magus/ChangeLog b/games-rpg/magus/ChangeLog
new file mode 100644
index 00000000..4422bda3
--- /dev/null
+++ b/games-rpg/magus/ChangeLog
@@ -0,0 +1,141 @@
+# ChangeLog for games-rpg/magus
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*magus-1.3.1 (28 Dec 2014)
+
+ 06 Aug 2015; Martin Väth <martin@mvath.de>:
+ Remove multiprocessing to avoid strange build errors
+
+ 02 Jan 2015; Martin Väth <martin@mvath.de>:
+ Update postgresql dependency
+
+ 28 Dec 2014; Martin Väth <martin@mvath.de>:
+ Downgrade to now only public version from sourceforge.
+ Rename configure.in -> configure.ac for compatibility with current automake.
+
+*magus-1.3.3 (28 May 2011)
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 02 Aug 2012; Martin Väth <martin@mvath.de>:
+ Parallelize patching and eautoreconf calls
+
+ 01 Jul 2012; Martin Väth <martin@mvath.de>:
+ Use prune_libtool_files --all
+
+ 10 Jun 2012; Martin Väth <martin@mvath.de>:
+ Remove support for icecat. Fix postgresql dependency
+
+ 06 Jun 2012; Martin Väth <martin@mvath.de>:
+ Use new eutils features prune_libtool_files, doicon
+
+ 28 May 2012; Martin Väth <martin@mvath.de>:
+ Cleaner dependencies and messages for colliding USE-flags.
+ Rely on automagic eautopoint. Add support for optional imagemagick.
+
+ 17 May 2012; Martin Väth <martin@mvath.de>:
+ Remove REQUIRED_USE; default to firefox
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 16 Apr 2012; Martin Väth <martin@mvath.de>:
+ Use eautopoint and relax gettext runtime dependency
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 13 Mar 2012; Martin Väth <martin@mvath.de>:
+ Fix dependency on dev-cpp/gtkmm: slot 3 is not (yet?) supported upstream.
+ Introduce pngcrush useflag.
+
+ 30 Sep 2011; Martin Väth <martin@mvath.de>:
+ Fix dependencies, in particular do not require optional media-gfx/pngcrush
+
+ 29 May 2011; Martin Väth <martin@mvath.de>:
+ Add REQUIRED_USE and fix some missing dependencies.
+
+ 28 May 2011; Martin Väth <martin@mvath.de>:
+ Version bump and patch for missing autopoint support.
+ Remove old ebuild.
+
+*magus-1.3.1 (10 Mar 2010)
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 25 Jul 2010; Martin Väth <martin@mvath.de>: :
+ Do not install unnecessary .h files.
+ mozilla-firefox->firefox.
+ USE flags: Add icecat, rename kde->konqueror, pdf->acroread.
+ Let firefox USE take precedence.
+
+ 31 Mar 2010; Martin Väth <martin@mvath.de>: :
+ +magus-1.3.1.ebuild +magus-99999999.ebuild -magus-live-1.3.1-r6.ebuild:
+ Rename magus-live into magus: Since now some tarball is available and the
+ monotone repository is too often inaccessible, we do not install the
+ live-version by default. If you want to install the live version unmask
+ the magus-99999999 ebuild with
+ echo 'games-rpg/magus **' >>/etc/portage/package.keywords
+ Note that you can prevent the live version from fetching the monotone
+ repository by setting ESCM_OFFLINE=1 or EMTN_OFFLINE=1 (temporarily in the
+ environment or permanently in /etc/make.conf); the former will influence all
+ live ebuilds, the latter only those which use monotone (currently only magus)
+
+*magus-live-1.3.1 (03 May 2010)
+
+ 10 Mar 2010; Martin Väth <martin@mvath.de>: :
+ magus-live-1.3.1-r6.ebuild: Fix monotone dependency.
+
+ 08 Jan 2010; Martin Väth <martin@mvath.de>: :
+ magus-live-1.3.1-r6.ebuild: Fix postgresql dependency.
+
+ 04 Jan 2010; Martin Väth <martin@mvath.de>: :
+ magus-live-1.3.1-r6.ebuild: Select latest head.
+ Remove useless static libs and .la files by default;
+ can be overridden by EXTRA_ECONF=--enable-static
+
+ 03 Jan 2010; Martin Väth <martin@mvath.de>: :
+ magus-live-1.3.1-r5.ebuild: Select Christoph's head.
+
+ 10 May 2009; Martin Väth <martin@mvath.de>: :
+ magus-live-1.3.1-r4.ebuild: Support gcc-4.4
+
+ 03 May 2009; Martin Väth <martin@mvath.de>: :
+ magus-live-1.3.1-r3.ebuild: Switch to EAPI=2
+
+ 03 Dec 2008; Martin Väth <martin@mvath.de>: :
+ Useflag seamonkey. Put inherit at begin.
+ Patch build system to work with --as-needed.
+
+ 20 Sep 2008; Martin Väth <martin@mvath.de>: :
+ Useflag postgres (instead of sqlite with inverted meaning).
+ Use firefox/kde as default browser. Introduce USE firefox/kde for dependency.
+ Install icons. Use doins -r for doc installing.
+ Introduce metadata.xml to explain useflags.
+
+ 24 Aug 2008; Martin Väth <martin@mvath.de>: :
+ Support for sqlite. Warn if patches are not necessary anymore.
+ Split configure and make so that separate phases can be used for EAPI=2
+ if upstream supports it.
+
+ 11 Jul 2008; Martin Väth <martin@mvath.de>: :
+ Support autotools eclass and filter some bad flags
+
+ 22 Dec 2007; Martin Väth <martin@mvath.de>: :
+ Rather complete rewrite for monotone
+
+ 31 Aug 2007; Martin Väth <martin@mvath.de>: :
+ Patch german gpl tex to use modern style {inputenc} which works with texlive
+
+ 20 Nov 2005; Martin Väth <martin@mvath.de>: :
+ Dependency to media-gfx/pngcrush and compile dependency to virtual/tetex
+
+ 19 Nov 2005; Martin Väth <martin@mvath.de>: :
+ Honor useflag postgres to make dependency on dev-db/postgresql optional
+
+ 03 May 2005; Martin Väth <martin@mvath.de>: :
+ Initial version from scratch
+
diff --git a/games-rpg/magus/Manifest b/games-rpg/magus/Manifest
new file mode 100644
index 00000000..16800cab
--- /dev/null
+++ b/games-rpg/magus/Manifest
@@ -0,0 +1,2 @@
+DIST magus-1.3.1.tar.bz2 7358580 SHA256 f7f118dff53b53a45d612d870bc2c9fb151d9c3aeea6f006b74fc6ab41dcb4d6 SHA512 b08231bb391d7f11c010afb0b881f063dbc1469d9032ba9ed9d3480e3d709709472a8e25d7104c5ee59f7e2fd222f417429233a9d730cb90a4538b089280e7c9 WHIRLPOOL 1b3dde3fc06e79ad80b4bc6ac34d5757ec81aa8a28fa9e82e46aa0ba9a3b30cb83d2c9ab8d8ca6f23cb51f00e978134b0646c839c0da4fa221b0fbbe4c10d522
+DIST magus-1.3.3.tar.bz2 7417528 SHA256 14d75aba616149e52252fe0f1d0bae796936295aacfb82f1f620d1efd20a8e86
diff --git a/games-rpg/magus/magus-1.3.1.ebuild b/games-rpg/magus/magus-1.3.1.ebuild
new file mode 100644
index 00000000..fd1eead1
--- /dev/null
+++ b/games-rpg/magus/magus-1.3.1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+RESTRICT="mirror"
+
+FETCH_RESTRICT=false
+LIVE_VERSION=false
+case ${PV} in
+9999*)
+ LIVE_VERSION=:;;
+1.3.3*)
+ FETCH_RESTRICT=:;;
+esac
+
+${LIVE_VERSION} && inherit monotone
+
+DESCRIPTION="A character generator for the popular German role playing game Midgard"
+HOMEPAGE="http://sourceforge.net/projects/midgard.berlios/"
+SRC_URI="mirror://sourceforge/midgard.berlios/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+if ${LIVE_VERSION}
+then PROPERTIES="live"
+ SRC_URI=""
+ EMTN_REPO_URI="petig-baender.dyndns.org"
+ KEYWORDS=""
+elif ${FETCH_RESTRICT}
+then SRC_URI="ftp://ftp.berlios.de/pub/midgard/Source/${P}.tar.bz2"
+# Unfortunately, the URL is down forever:
+# You can only use it, if you already downloaded the tarball earlier
+ RESTRICT="${RESTRICT} fetch"
+ KEYWORDS=""
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+acroread imagemagick konqueror postgres pngcrush seamonkey"
+
+DEPENDCOMMON="dev-libs/libsigc++:2
+ dev-cpp/gtkmm:2.4
+ virtual/latex-base
+ postgres? ( dev-db/postgresql )
+ !postgres? ( dev-db/sqlite:3 )
+ || ( media-libs/netpbm media-gfx/graphicsmagick media-gfx/imagemagick )"
+
+DEPEND="${DEPENDCOMMON}
+ sys-devel/gettext
+ pngcrush? ( media-gfx/pngcrush )
+ imagemagick? ( || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) )"
+
+RDEPEND="${DEPENDCOMMON}
+ seamonkey? ( www-client/seamonkey )
+ !seamonkey? (
+ konqueror? ( kde-base/konqueror )
+ !konqueror? (
+ || ( www-client/firefox www-client/firefox-bin )
+ )
+ )
+ acroread? ( app-text/acroread )
+ virtual/libintl"
+
+if ${LIVE_VERSION}
+then
+src_unpack() {
+ monotone_fetch
+ monotone_co "" "manuproc.berlios.de/ManuProC_Base"
+ monotone_co "" "manuproc.berlios.de/GtkmmAddons"
+ monotone_co "" "manuproc.berlios.de/ManuProC_Widgets"
+ monotone_co "" "midgard.berlios.de/midgard"
+ monotone_finish
+}
+fi
+
+src_cp() {
+ einfo "cp ${1} ${2}"
+ test -f "${1}" || {
+ ewarn "File ${1} does not exist"
+ return 0
+ }
+ if ! test -e "${2}" || diff -q -- "${1}" "${2}" >/dev/null 2>&1
+ then ewarn "cp ${1} ${2} appears no longer necessary"
+ return 0
+ fi
+ cp -- "${1}" "${2}"
+}
+
+src_sed() {
+ local short file ori ignore remove grep opt
+ ignore=false
+ remove=false
+ grep=''
+ OPTIND=1
+ while getopts 'fig:' opt
+ do case ${opt} in
+ f) remove=:;;
+ i) ignore=:;;
+ g) grep=${OPTARG};;
+ esac
+ done
+ shift $(( ${OPTIND} - 1 ))
+ short=${1}
+ file="${S}/${short}"
+ ori="${file}.ori"
+ test -e "${ori}" && ${ignore} && ori="${file}.ori-1" && remove=:
+ test -e "${ori}" && die "File ${ori} already exists"
+ if ! test -e "${file}"
+ then die "Expected file ${short} does not exist"
+ fi
+ einfo "Patching ${short}"
+ [ -n "${grep}" ] && grep -q -- "${grep}" "${file}" \
+ && ewarn "Redundant patching of ${short}"
+ mv -- "${file}" "${ori}"
+ shift
+ sed "${@}" -- "${ori}" >"${file}"
+ ! ${ignore} && cmp -s -- "${ori}" "${file}" \
+ && ewarn "Unneeded patching of ${short}"
+ ${remove} && rm -- "${ori}"
+ return 0
+}
+
+set_browser() {
+ local i browser
+ browser=
+ for i in seamonkey konqueror
+ do use "${i}" || continue
+ if [ -n "${browser}" ]
+ then ewarn "USE=${i} is overridden by USE=${browser}"
+ else browser=${i}
+ fi
+ done
+ einfo
+ if [ -z "${browser}" ]
+ then browser="firefox"
+ einfo "Patching for default browser ${browser}:"
+ elif [ "${browser}" = "mozilla" ]
+ then einfo "Keeping upstream's default browser (mozilla)"
+ einfo
+ return
+ else einfo "USE=${browser} overrides default browser firefox:"
+ fi
+ einfo
+ src_sed midgard/docs/BMod_Op.html -e "s#mozilla#${browser}#"
+ src_sed midgard/libmagus/Magus_Optionen.cc -e "s#mozilla#${browser}#"
+ src_sed midgard/midgard.glade -e "s#mozilla#${browser}#"
+ src_sed midgard/src/table_optionen_glade.cc -e "s#mozilla#${browser}#"
+}
+
+src_patch() {
+ einfo
+ einfo "Various patches:"
+ einfo
+ grep "saebel.png" midgard/src/Makefile.am && \
+ ewarn "Unneeded patching of midgard/src/Makefile.am"
+ src_sed midgard/src/Makefile.am \
+ -e 's/drache.png/Money-gray.png saebel.png drache.png/'
+ src_sed ManuProC_Widgets/configure.in \
+ -e 's/^[[:space:]]*AM_GNU_GETTEXT_VERSION/AM_GNU_GETTEXT_VERSION/'
+ src_sed -g 'AM_GNU_GETTEXT_VERSION' ManuProC_Base/configure.in \
+ -e '/AC_SUBST(GETTEXT_PACKAGE)/iAM_GNU_GETTEXT_VERSION([0.17])'
+# src_cp ManuProC_Base/macros/petig.m4 ManuProC_Widgets/macros/petig.m4
+ src_sed midgard/src/table_lernschema.cc \
+ -e '/case .*:$/{n;s/^[[:space:]]*\}/break;}/}'
+ find . -name configure.in -exec sh -c 'for i
+ do mv -- "${i}" "${i%in}ac"
+ done' sh '{}' +
+}
+
+my_cd() {
+ cd -- "${S}/${1}" >/dev/null || die "cd ${1} failed"
+}
+
+my_autoreconf() {
+ my_cd "${1}"
+ export AT_M4DIR
+ test -d macros && AT_M4DIR="macros" || AT_M4DIR=""
+ eautoreconf
+}
+
+src_prepare() {
+ local i
+ src_patch
+ epatch_user
+ set_browser
+ einfo
+ einfo "Calling eautoreconf for all subprojects:"
+ einfo
+ for i in "${S}"/*
+ do my_autoreconf "${i##*/}"
+ done
+}
+
+my_conf() {
+ einfo
+ einfo "configuring ${1}"
+ einfo
+ my_cd "${1}"
+ shift
+ if [ -z "${COMMON_CONF}" ]
+ then COMMON_CONF="$(use_enable !postgres sqlite)"
+ COMMON_CONF="${COMMON_CONF} $(use_with postgres postgresdir /usr)"
+ COMMON_CONF="${COMMON_CONF} --disable-static"
+ fi
+ econf ${COMMON_CONF} "${@}"
+}
+
+my_make() {
+ einfo
+ einfo "making ${*}"
+ einfo
+ my_cd "${1}"
+ emake || die "emake in ${1} failed"
+}
+
+my_confmake() {
+ # It is unfortunate that we must build here,
+ # but some ./configure's require make in other directories_
+ my_make "GtkmmAddons" "(needed for configuring ManuProC_Widget and midgard)"
+ my_make "ManuProC_Base" "(needed for configuring ManuProC_Widget and midgard)"
+ my_conf "ManuProC_Widgets"
+ my_make "ManuProC_Widgets" "(needed for configuring midgard)"
+ my_conf "midgard"
+}
+
+src_configure() {
+ filter-flags \
+ -pie \
+ -fPIE \
+ -flto \
+ -fwhole-program \
+ -fuse-linker-plugin \
+ -fvisibility-inlines-hidden
+ my_conf "ManuProC_Base"
+ my_conf "GtkmmAddons"
+ my_confmake
+}
+
+src_compile() {
+ my_make "midgard"
+}
+
+my_install() {
+ my_cd "${1}"
+ emake DESTDIR="${ED}" install || die "make install in ${1} failed"
+}
+
+src_install() {
+ local myicon myres
+ my_install "ManuProC_Base"
+ my_install "ManuProC_Widgets"
+ my_install "midgard"
+ rm -rf -- "${ED}"/usr/include
+ prune_libtool_files --all
+
+ insinto "/usr/share/magus"
+
+ my_cd "midgard"
+
+ doins -r docs
+ #doins xml/*.xml src/*.png src/*.tex
+
+ for myicon in pixmaps/desktop-icons/MAGUS-*.png
+ do test -e "${myicon}" || continue
+ myres=${myicon##*/MAGUS?}
+ myres=${myres%.png}
+ doicon -s "${myres}" "${myicon}"
+ done
+}
diff --git a/games-rpg/magus/magus-1.3.3.ebuild b/games-rpg/magus/magus-1.3.3.ebuild
new file mode 100644
index 00000000..fd1eead1
--- /dev/null
+++ b/games-rpg/magus/magus-1.3.3.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+RESTRICT="mirror"
+
+FETCH_RESTRICT=false
+LIVE_VERSION=false
+case ${PV} in
+9999*)
+ LIVE_VERSION=:;;
+1.3.3*)
+ FETCH_RESTRICT=:;;
+esac
+
+${LIVE_VERSION} && inherit monotone
+
+DESCRIPTION="A character generator for the popular German role playing game Midgard"
+HOMEPAGE="http://sourceforge.net/projects/midgard.berlios/"
+SRC_URI="mirror://sourceforge/midgard.berlios/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+if ${LIVE_VERSION}
+then PROPERTIES="live"
+ SRC_URI=""
+ EMTN_REPO_URI="petig-baender.dyndns.org"
+ KEYWORDS=""
+elif ${FETCH_RESTRICT}
+then SRC_URI="ftp://ftp.berlios.de/pub/midgard/Source/${P}.tar.bz2"
+# Unfortunately, the URL is down forever:
+# You can only use it, if you already downloaded the tarball earlier
+ RESTRICT="${RESTRICT} fetch"
+ KEYWORDS=""
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+acroread imagemagick konqueror postgres pngcrush seamonkey"
+
+DEPENDCOMMON="dev-libs/libsigc++:2
+ dev-cpp/gtkmm:2.4
+ virtual/latex-base
+ postgres? ( dev-db/postgresql )
+ !postgres? ( dev-db/sqlite:3 )
+ || ( media-libs/netpbm media-gfx/graphicsmagick media-gfx/imagemagick )"
+
+DEPEND="${DEPENDCOMMON}
+ sys-devel/gettext
+ pngcrush? ( media-gfx/pngcrush )
+ imagemagick? ( || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) )"
+
+RDEPEND="${DEPENDCOMMON}
+ seamonkey? ( www-client/seamonkey )
+ !seamonkey? (
+ konqueror? ( kde-base/konqueror )
+ !konqueror? (
+ || ( www-client/firefox www-client/firefox-bin )
+ )
+ )
+ acroread? ( app-text/acroread )
+ virtual/libintl"
+
+if ${LIVE_VERSION}
+then
+src_unpack() {
+ monotone_fetch
+ monotone_co "" "manuproc.berlios.de/ManuProC_Base"
+ monotone_co "" "manuproc.berlios.de/GtkmmAddons"
+ monotone_co "" "manuproc.berlios.de/ManuProC_Widgets"
+ monotone_co "" "midgard.berlios.de/midgard"
+ monotone_finish
+}
+fi
+
+src_cp() {
+ einfo "cp ${1} ${2}"
+ test -f "${1}" || {
+ ewarn "File ${1} does not exist"
+ return 0
+ }
+ if ! test -e "${2}" || diff -q -- "${1}" "${2}" >/dev/null 2>&1
+ then ewarn "cp ${1} ${2} appears no longer necessary"
+ return 0
+ fi
+ cp -- "${1}" "${2}"
+}
+
+src_sed() {
+ local short file ori ignore remove grep opt
+ ignore=false
+ remove=false
+ grep=''
+ OPTIND=1
+ while getopts 'fig:' opt
+ do case ${opt} in
+ f) remove=:;;
+ i) ignore=:;;
+ g) grep=${OPTARG};;
+ esac
+ done
+ shift $(( ${OPTIND} - 1 ))
+ short=${1}
+ file="${S}/${short}"
+ ori="${file}.ori"
+ test -e "${ori}" && ${ignore} && ori="${file}.ori-1" && remove=:
+ test -e "${ori}" && die "File ${ori} already exists"
+ if ! test -e "${file}"
+ then die "Expected file ${short} does not exist"
+ fi
+ einfo "Patching ${short}"
+ [ -n "${grep}" ] && grep -q -- "${grep}" "${file}" \
+ && ewarn "Redundant patching of ${short}"
+ mv -- "${file}" "${ori}"
+ shift
+ sed "${@}" -- "${ori}" >"${file}"
+ ! ${ignore} && cmp -s -- "${ori}" "${file}" \
+ && ewarn "Unneeded patching of ${short}"
+ ${remove} && rm -- "${ori}"
+ return 0
+}
+
+set_browser() {
+ local i browser
+ browser=
+ for i in seamonkey konqueror
+ do use "${i}" || continue
+ if [ -n "${browser}" ]
+ then ewarn "USE=${i} is overridden by USE=${browser}"
+ else browser=${i}
+ fi
+ done
+ einfo
+ if [ -z "${browser}" ]
+ then browser="firefox"
+ einfo "Patching for default browser ${browser}:"
+ elif [ "${browser}" = "mozilla" ]
+ then einfo "Keeping upstream's default browser (mozilla)"
+ einfo
+ return
+ else einfo "USE=${browser} overrides default browser firefox:"
+ fi
+ einfo
+ src_sed midgard/docs/BMod_Op.html -e "s#mozilla#${browser}#"
+ src_sed midgard/libmagus/Magus_Optionen.cc -e "s#mozilla#${browser}#"
+ src_sed midgard/midgard.glade -e "s#mozilla#${browser}#"
+ src_sed midgard/src/table_optionen_glade.cc -e "s#mozilla#${browser}#"
+}
+
+src_patch() {
+ einfo
+ einfo "Various patches:"
+ einfo
+ grep "saebel.png" midgard/src/Makefile.am && \
+ ewarn "Unneeded patching of midgard/src/Makefile.am"
+ src_sed midgard/src/Makefile.am \
+ -e 's/drache.png/Money-gray.png saebel.png drache.png/'
+ src_sed ManuProC_Widgets/configure.in \
+ -e 's/^[[:space:]]*AM_GNU_GETTEXT_VERSION/AM_GNU_GETTEXT_VERSION/'
+ src_sed -g 'AM_GNU_GETTEXT_VERSION' ManuProC_Base/configure.in \
+ -e '/AC_SUBST(GETTEXT_PACKAGE)/iAM_GNU_GETTEXT_VERSION([0.17])'
+# src_cp ManuProC_Base/macros/petig.m4 ManuProC_Widgets/macros/petig.m4
+ src_sed midgard/src/table_lernschema.cc \
+ -e '/case .*:$/{n;s/^[[:space:]]*\}/break;}/}'
+ find . -name configure.in -exec sh -c 'for i
+ do mv -- "${i}" "${i%in}ac"
+ done' sh '{}' +
+}
+
+my_cd() {
+ cd -- "${S}/${1}" >/dev/null || die "cd ${1} failed"
+}
+
+my_autoreconf() {
+ my_cd "${1}"
+ export AT_M4DIR
+ test -d macros && AT_M4DIR="macros" || AT_M4DIR=""
+ eautoreconf
+}
+
+src_prepare() {
+ local i
+ src_patch
+ epatch_user
+ set_browser
+ einfo
+ einfo "Calling eautoreconf for all subprojects:"
+ einfo
+ for i in "${S}"/*
+ do my_autoreconf "${i##*/}"
+ done
+}
+
+my_conf() {
+ einfo
+ einfo "configuring ${1}"
+ einfo
+ my_cd "${1}"
+ shift
+ if [ -z "${COMMON_CONF}" ]
+ then COMMON_CONF="$(use_enable !postgres sqlite)"
+ COMMON_CONF="${COMMON_CONF} $(use_with postgres postgresdir /usr)"
+ COMMON_CONF="${COMMON_CONF} --disable-static"
+ fi
+ econf ${COMMON_CONF} "${@}"
+}
+
+my_make() {
+ einfo
+ einfo "making ${*}"
+ einfo
+ my_cd "${1}"
+ emake || die "emake in ${1} failed"
+}
+
+my_confmake() {
+ # It is unfortunate that we must build here,
+ # but some ./configure's require make in other directories_
+ my_make "GtkmmAddons" "(needed for configuring ManuProC_Widget and midgard)"
+ my_make "ManuProC_Base" "(needed for configuring ManuProC_Widget and midgard)"
+ my_conf "ManuProC_Widgets"
+ my_make "ManuProC_Widgets" "(needed for configuring midgard)"
+ my_conf "midgard"
+}
+
+src_configure() {
+ filter-flags \
+ -pie \
+ -fPIE \
+ -flto \
+ -fwhole-program \
+ -fuse-linker-plugin \
+ -fvisibility-inlines-hidden
+ my_conf "ManuProC_Base"
+ my_conf "GtkmmAddons"
+ my_confmake
+}
+
+src_compile() {
+ my_make "midgard"
+}
+
+my_install() {
+ my_cd "${1}"
+ emake DESTDIR="${ED}" install || die "make install in ${1} failed"
+}
+
+src_install() {
+ local myicon myres
+ my_install "ManuProC_Base"
+ my_install "ManuProC_Widgets"
+ my_install "midgard"
+ rm -rf -- "${ED}"/usr/include
+ prune_libtool_files --all
+
+ insinto "/usr/share/magus"
+
+ my_cd "midgard"
+
+ doins -r docs
+ #doins xml/*.xml src/*.png src/*.tex
+
+ for myicon in pixmaps/desktop-icons/MAGUS-*.png
+ do test -e "${myicon}" || continue
+ myres=${myicon##*/MAGUS?}
+ myres=${myres%.png}
+ doicon -s "${myres}" "${myicon}"
+ done
+}
diff --git a/games-rpg/magus/magus-99999999.ebuild b/games-rpg/magus/magus-99999999.ebuild
new file mode 100644
index 00000000..fd1eead1
--- /dev/null
+++ b/games-rpg/magus/magus-99999999.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+RESTRICT="mirror"
+
+FETCH_RESTRICT=false
+LIVE_VERSION=false
+case ${PV} in
+9999*)
+ LIVE_VERSION=:;;
+1.3.3*)
+ FETCH_RESTRICT=:;;
+esac
+
+${LIVE_VERSION} && inherit monotone
+
+DESCRIPTION="A character generator for the popular German role playing game Midgard"
+HOMEPAGE="http://sourceforge.net/projects/midgard.berlios/"
+SRC_URI="mirror://sourceforge/midgard.berlios/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+if ${LIVE_VERSION}
+then PROPERTIES="live"
+ SRC_URI=""
+ EMTN_REPO_URI="petig-baender.dyndns.org"
+ KEYWORDS=""
+elif ${FETCH_RESTRICT}
+then SRC_URI="ftp://ftp.berlios.de/pub/midgard/Source/${P}.tar.bz2"
+# Unfortunately, the URL is down forever:
+# You can only use it, if you already downloaded the tarball earlier
+ RESTRICT="${RESTRICT} fetch"
+ KEYWORDS=""
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+acroread imagemagick konqueror postgres pngcrush seamonkey"
+
+DEPENDCOMMON="dev-libs/libsigc++:2
+ dev-cpp/gtkmm:2.4
+ virtual/latex-base
+ postgres? ( dev-db/postgresql )
+ !postgres? ( dev-db/sqlite:3 )
+ || ( media-libs/netpbm media-gfx/graphicsmagick media-gfx/imagemagick )"
+
+DEPEND="${DEPENDCOMMON}
+ sys-devel/gettext
+ pngcrush? ( media-gfx/pngcrush )
+ imagemagick? ( || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) )"
+
+RDEPEND="${DEPENDCOMMON}
+ seamonkey? ( www-client/seamonkey )
+ !seamonkey? (
+ konqueror? ( kde-base/konqueror )
+ !konqueror? (
+ || ( www-client/firefox www-client/firefox-bin )
+ )
+ )
+ acroread? ( app-text/acroread )
+ virtual/libintl"
+
+if ${LIVE_VERSION}
+then
+src_unpack() {
+ monotone_fetch
+ monotone_co "" "manuproc.berlios.de/ManuProC_Base"
+ monotone_co "" "manuproc.berlios.de/GtkmmAddons"
+ monotone_co "" "manuproc.berlios.de/ManuProC_Widgets"
+ monotone_co "" "midgard.berlios.de/midgard"
+ monotone_finish
+}
+fi
+
+src_cp() {
+ einfo "cp ${1} ${2}"
+ test -f "${1}" || {
+ ewarn "File ${1} does not exist"
+ return 0
+ }
+ if ! test -e "${2}" || diff -q -- "${1}" "${2}" >/dev/null 2>&1
+ then ewarn "cp ${1} ${2} appears no longer necessary"
+ return 0
+ fi
+ cp -- "${1}" "${2}"
+}
+
+src_sed() {
+ local short file ori ignore remove grep opt
+ ignore=false
+ remove=false
+ grep=''
+ OPTIND=1
+ while getopts 'fig:' opt
+ do case ${opt} in
+ f) remove=:;;
+ i) ignore=:;;
+ g) grep=${OPTARG};;
+ esac
+ done
+ shift $(( ${OPTIND} - 1 ))
+ short=${1}
+ file="${S}/${short}"
+ ori="${file}.ori"
+ test -e "${ori}" && ${ignore} && ori="${file}.ori-1" && remove=:
+ test -e "${ori}" && die "File ${ori} already exists"
+ if ! test -e "${file}"
+ then die "Expected file ${short} does not exist"
+ fi
+ einfo "Patching ${short}"
+ [ -n "${grep}" ] && grep -q -- "${grep}" "${file}" \
+ && ewarn "Redundant patching of ${short}"
+ mv -- "${file}" "${ori}"
+ shift
+ sed "${@}" -- "${ori}" >"${file}"
+ ! ${ignore} && cmp -s -- "${ori}" "${file}" \
+ && ewarn "Unneeded patching of ${short}"
+ ${remove} && rm -- "${ori}"
+ return 0
+}
+
+set_browser() {
+ local i browser
+ browser=
+ for i in seamonkey konqueror
+ do use "${i}" || continue
+ if [ -n "${browser}" ]
+ then ewarn "USE=${i} is overridden by USE=${browser}"
+ else browser=${i}
+ fi
+ done
+ einfo
+ if [ -z "${browser}" ]
+ then browser="firefox"
+ einfo "Patching for default browser ${browser}:"
+ elif [ "${browser}" = "mozilla" ]
+ then einfo "Keeping upstream's default browser (mozilla)"
+ einfo
+ return
+ else einfo "USE=${browser} overrides default browser firefox:"
+ fi
+ einfo
+ src_sed midgard/docs/BMod_Op.html -e "s#mozilla#${browser}#"
+ src_sed midgard/libmagus/Magus_Optionen.cc -e "s#mozilla#${browser}#"
+ src_sed midgard/midgard.glade -e "s#mozilla#${browser}#"
+ src_sed midgard/src/table_optionen_glade.cc -e "s#mozilla#${browser}#"
+}
+
+src_patch() {
+ einfo
+ einfo "Various patches:"
+ einfo
+ grep "saebel.png" midgard/src/Makefile.am && \
+ ewarn "Unneeded patching of midgard/src/Makefile.am"
+ src_sed midgard/src/Makefile.am \
+ -e 's/drache.png/Money-gray.png saebel.png drache.png/'
+ src_sed ManuProC_Widgets/configure.in \
+ -e 's/^[[:space:]]*AM_GNU_GETTEXT_VERSION/AM_GNU_GETTEXT_VERSION/'
+ src_sed -g 'AM_GNU_GETTEXT_VERSION' ManuProC_Base/configure.in \
+ -e '/AC_SUBST(GETTEXT_PACKAGE)/iAM_GNU_GETTEXT_VERSION([0.17])'
+# src_cp ManuProC_Base/macros/petig.m4 ManuProC_Widgets/macros/petig.m4
+ src_sed midgard/src/table_lernschema.cc \
+ -e '/case .*:$/{n;s/^[[:space:]]*\}/break;}/}'
+ find . -name configure.in -exec sh -c 'for i
+ do mv -- "${i}" "${i%in}ac"
+ done' sh '{}' +
+}
+
+my_cd() {
+ cd -- "${S}/${1}" >/dev/null || die "cd ${1} failed"
+}
+
+my_autoreconf() {
+ my_cd "${1}"
+ export AT_M4DIR
+ test -d macros && AT_M4DIR="macros" || AT_M4DIR=""
+ eautoreconf
+}
+
+src_prepare() {
+ local i
+ src_patch
+ epatch_user
+ set_browser
+ einfo
+ einfo "Calling eautoreconf for all subprojects:"
+ einfo
+ for i in "${S}"/*
+ do my_autoreconf "${i##*/}"
+ done
+}
+
+my_conf() {
+ einfo
+ einfo "configuring ${1}"
+ einfo
+ my_cd "${1}"
+ shift
+ if [ -z "${COMMON_CONF}" ]
+ then COMMON_CONF="$(use_enable !postgres sqlite)"
+ COMMON_CONF="${COMMON_CONF} $(use_with postgres postgresdir /usr)"
+ COMMON_CONF="${COMMON_CONF} --disable-static"
+ fi
+ econf ${COMMON_CONF} "${@}"
+}
+
+my_make() {
+ einfo
+ einfo "making ${*}"
+ einfo
+ my_cd "${1}"
+ emake || die "emake in ${1} failed"
+}
+
+my_confmake() {
+ # It is unfortunate that we must build here,
+ # but some ./configure's require make in other directories_
+ my_make "GtkmmAddons" "(needed for configuring ManuProC_Widget and midgard)"
+ my_make "ManuProC_Base" "(needed for configuring ManuProC_Widget and midgard)"
+ my_conf "ManuProC_Widgets"
+ my_make "ManuProC_Widgets" "(needed for configuring midgard)"
+ my_conf "midgard"
+}
+
+src_configure() {
+ filter-flags \
+ -pie \
+ -fPIE \
+ -flto \
+ -fwhole-program \
+ -fuse-linker-plugin \
+ -fvisibility-inlines-hidden
+ my_conf "ManuProC_Base"
+ my_conf "GtkmmAddons"
+ my_confmake
+}
+
+src_compile() {
+ my_make "midgard"
+}
+
+my_install() {
+ my_cd "${1}"
+ emake DESTDIR="${ED}" install || die "make install in ${1} failed"
+}
+
+src_install() {
+ local myicon myres
+ my_install "ManuProC_Base"
+ my_install "ManuProC_Widgets"
+ my_install "midgard"
+ rm -rf -- "${ED}"/usr/include
+ prune_libtool_files --all
+
+ insinto "/usr/share/magus"
+
+ my_cd "midgard"
+
+ doins -r docs
+ #doins xml/*.xml src/*.png src/*.tex
+
+ for myicon in pixmaps/desktop-icons/MAGUS-*.png
+ do test -e "${myicon}" || continue
+ myres=${myicon##*/MAGUS?}
+ myres=${myres%.png}
+ doicon -s "${myres}" "${myicon}"
+ done
+}
diff --git a/games-rpg/magus/metadata.xml b/games-rpg/magus/metadata.xml
new file mode 100644
index 00000000..e6abf3f2
--- /dev/null
+++ b/games-rpg/magus/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>martin@mvath.de</email>
+ <name>Martin Väth</name>
+ </maintainer>
+ <upstream>
+ <maintainer>
+ <email></email>
+ <name>Christof Petig</name>
+ </maintainer>
+ <maintainer>
+ <email></email>
+ <name>Malte Thoma</name>
+ </maintainer>
+ <maintainer>
+ <email></email>
+ <name>Alessandro Filippetti</name>
+ </maintainer>
+ <bugs-to>http://midgard.berlios.de/pages/bugform.html</bugs-to>
+ </upstream>
+ <use>
+ <flag name="acroread">Depend on acroread (otherwise you are responsible to install/configure a pdf viewer)</flag>
+ <flag name="konqueror">Depend on konqueror browser instead of firefox</flag>
+ <flag name="postgres">Use postgresql instead of sqlite</flag>
+ <flag name="seamonkey">Depend on seamonkey browser instead of firefox</flag>
+ <flag name="pngcrush">Use pngcrush for opimizing png before installation</flag>
+ <flag name="imagemagick">Use convert from graphicsmagick/imagemagick to scale pictures before installation</flag>
+ </use>
+</pkgmetadata>
diff --git a/licenses/AgereSystems-WinModem b/licenses/AgereSystems-WinModem
deleted file mode 100644
index 27a837cb..00000000
--- a/licenses/AgereSystems-WinModem
+++ /dev/null
@@ -1,104 +0,0 @@
-Agere Systems WinModem End User SOFTWARE LICENSE AGREEMENT
-
-The terms and conditions of this Agreement will apply to the Agere
-Systems WinModem Software (hereafter "Software") supplied under this Agreement
-and any derivatives obtained therefrom, including any copy. The term Software
-includes programs and related documentation supplied herewith.
-
-The following file is made available under the standard Linux license,
-a copy of which may be found at .
-serial.c
-serial24.c
-
-These additional files are not derived from any Linux open source content,
-and are subject to the following restrictions.
-ltmodem.c
-linuxif.h
-ltmdmobj.o
-Makefile
-ltinst
-ltuninst
-readme.txt
-
-1.0 TITLE AND LICENSE GRANT
-
- 1.1 The Software is copyrighted and/or contains proprietary
- information protected by law. All Software and all copies
- thereof are and will remain the sole property of Agere Systems or
- its suppliers. Agere Systems hereby grants you a non-exclusive right
- to use the Software, in whatever form recorded, which is furnished to
- you under or in contemplation of this Agreement, in an Agere Systems
- winmodem. Any other use of the Software or removal of the Software from
- a country in which use is licensed shall automatically terminate this license.
-
- 1.2 You agree to use your best efforts to see that any user of the Software
- licensed hereunder complies with the terms and conditions of this Agreement.
-
-
-2.0 SOFTWARE USE
-
- 2.1 You are permitted to make copies of the Software provided that any such copy
- shall contain the same copyright notice and proprietary marking included on
- the original Software.
-
- 2.2 You agree not to merge or combine any portion of the Software with any other
- software, other than the Linux operating system, unless expressly permitted by
- the laws of the jurisdiction where you are located. Any portion of the Software
- merged or combined with the other software will continue to be the subject of the
- terms and conditions of this Agreement and you agree to reproduce on the merged
- or combined portion of the Software the copyright and other proprietary rights
- notices included in the original Software.
-
- 2.3 Redistribution and Usage
- Agere permits use and limited redistribution of this Licensed Software in source and
- binary forms, with or without modification, subject to the following terms and conditions,
- in addition to the terms mentioned in this agreement.
-
- 2.3.1 Agere Systems reserves the right not to allow a third party to reuse or
- redistribute the software, at its sole discretion.
-
- 2.3.2 User hereby agrees not to remove or alter any copyright, trademark, credits
- and other proprietary notices contained within or associated with the Licensed
- Software, and shall include all such unaltered copyright, trademark, credits and
- other proprietary notices on or in every copy of the Software.
-
- 2.3.3 Notwithstanding any other provisions in this Agreement to the contrary, any
- modifications or alterations made to the Licensed Software shall cause any
- warranties and intellectual property indemnifications to become null and
- void and of no further effect.
-
-3.0 DISCLAIMER OF WARRANTY
-
- 3.1 You understand and acknowledge that the Software may contain errors, bugs or other
- defects. The Software is provided on AS-IS basis, without warranty of any kind.
-
- 3.2 Agere Systems has used reasonable efforts to minimize defects or errors in the Software.
- HOWEVER, YOU ASSUME THE RISK OF ANY AND ALL DAMAGE OR LOSS FROM USE OR INABILITY TO USE
- THE SOFTWARE. Specifically, but not in limitation of the foregoing disclaimers, Agere
- Systems does not warrant that the functions of the Software will meet your requirements
- or that the Software operation will be error-free or uninterrupted.
-
- 3.3 Agere Systems bears no responsibility for supplying assistance for fixing or for
- communicating known errors to you pertaining to the Software supplied hereunder.
-
- 3.4 YOU UNDERSTAND THAT AGERE SYSTEMS, ITS AFFILIATES, CONTRACTORS, SUPPLIERS, AND AGENTS
- MAKE NO WARRANTIES, EXPRESS OR IMPLIED, AND SPECIFICALLY DISCLAIM ANY WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-4.0 EXCLUSIVE REMEDIES AND LIMITATION OF LIABILITIES
-
- 4.1 Regardless of any other provisions of this Agreement, neither Agere Systems nor its
- affiliates, contractors, suppliers, or agents shall be liable for any indirect, incidental,
- or consequential damages (including lost profits) sustained or incurred in connection with
- the use, operation, or inability to use the Software or for damages due to causes beyond
- the reasonable control of Agere Systems, its affiliates, contractors, suppliers, and agents
- attributable to any service, products, or action of any other person.
-
- 4.2 This Agreement shall be construed in accordance with and governed by the laws of the
- State of New York.
-
-YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT AND UNDERSTAND IT, AND THAT BY DOWNLOADING OR USING
-THE SOFTWARE, YOU AGREE TO BE BOUND BY ITS TERMS AND CONDITIONS. YOU FURTHER AGREE THAT THIS AGREEMENT
-IS THE COMPLETE AND EXCLUSIVE STATEMENT OF THE RIGHTS AND LIABILITIES OF THE PARTIES. THIS AGREEMENT
-SUPERCEDES ALL PRIOR ORAL AGREEMENTS, PROPOSALS OR UNDERSTANDINGS, AND ANY OTHER COMMUNICATIONS BETWEEN
-US RELATING TO THE SUBJECT MATTER OF THIS AGREEMENT.
diff --git a/licenses/FML-1 b/licenses/FML-1
deleted file mode 100644
index 9384d359..00000000
--- a/licenses/FML-1
+++ /dev/null
@@ -1,155 +0,0 @@
- ETHYMONICS FREE MUSIC LICENSE
-
- Version 1, August 2000
-
- Copyright (C) 2000, Ethymonics Limited
-
- Everyone is permitted to copy and distribute verbatim copies of this
- license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most musical works are designed to take away your
- freedom to share the music. By contrast, this Free Music License is
- intended to guarantee your freedom to make copies of a piece of music,
- and charge for this service if you wish. Recipients of those copies
- have the same freedom. The word "Free" in "Free Music License" means
- the freedom to make copies. It does not mean that those copies cannot
- then be sold.
-
- This license is designed to protect and pass on the right to make
- copies to whoever receives a copy. This encourages wide distribution on
- the artist's behalf. You can apply this license to your own music too.
-
- To protect the right to copy the music, it is necessary to pass on
- certain requirements that must be followed when the music is copied or
- distributed. For example, if you distribute a piece of music subject to
- this license, even if this is done for a fee, you must give the
- recipients all the rights that you have. You must show them these terms
- so that they know their rights.
-
- The freedom to copy is protected by two things: (1) Copyright of the
- music, and (2) This license that provides legal permission to copy and
- distribute the music.
-
- The precise terms and conditions for copying, distribution and
- performance follow.
-
- FREE MUSIC LICENSE
-
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND PERFORMANCE
-
- 1. This License applies to any musical work or other type of work which
- has a notice placed by the copyright holder saying that it may be
- distributed under the terms of this Free Music License. The "Music",
- below, refers to any such music or work, whether in a recording,
- performance or other form of musical representation, or any derivative
- work under copyright law: that is to say, a work, in any medium,
- containing the Music or a portion of it, either unaltered, modified and
- or re-performed.
-
- You may play or perform the Music publicly, for example in a broadcast,
- provided that you make available to listeners the title of the work and
- the name of the Artist. A recording made as a result of the Music being
- played or performed is covered by this License when its contents
- constitute a work based on the Music. If a listener wishes to make
- copies of such a recording, the terms and conditions of this License
- must be made available to them, along with any other information
- required to make and distribute copies according to the terms and
- conditions of this License.
-
- 2. You may copy and distribute copies of the Music as you receive it,
- in any medium, provided that you:
-
- (a) conspicuously and appropriately publish on each copy an appropriate
- copyright notice;
-
- (b) keep intact all the notices that refer to this License;
-
- (c) supply, with each copy of the Music, all significant information
- about the Music, including the title of the work, the name of the
- artist, and the names and roles of all credited personnel;
-
- (d) supply, to each recipient of the Music, along with the Music,
- either a copy of this License or a clearly visible URL that lets the
- recipient know where to find a copy of this License on the Internet.
-
- If the information required by (a) to (d) above is not available, for
- example when the Music has been received by making a recording of a
- performance, then this information must be obtained independently and
- no copies can be made or distributed without this information being
- included with each copy of the Music.
-
- You may, at your option, charge a fee for the act of supplying a copy
- of the Music.
-
- 3. You may not copy, distribute, perform or sub-license the Music
- except as expressly provided under this License. Any attempt to
- otherwise do so is void, and will automatically terminate your rights
- under this License. However, parties who have received copies, or
- rights, from you under this License will not have their Licenses
- terminated as long as such parties remain in full compliance.
-
- 4. You are not required to accept this License, since you have not
- signed it. However, nothing else grants you permission to copy,
- distribute, play or perform the Music or any of its derivative works.
- Therefore, by copying, distributing, playing or performing the Music,
- or any of its derivative works, you indicate your acceptance of this
- License to do so, and all of its terms and conditions.
-
- 5. Each time you redistribute the Music the recipient automatically
- receives a license from the original licensor to copy, distribute, play
- and or perform the Music subject to the terms and conditions of this
- License. You may not impose any further restrictions on the recipient's
- exercise of the rights granted herein. You are not responsible for
- enforcing compliance by third parties to this License.
-
- 6. If, as a consequence of a court judgment or allegation of copyright
- infringement or for any reason (not limited to copyright issues),
- conditions are imposed on you (whether by court order, agreement or
- otherwise) that contradict the conditions of this License, they do not
- excuse you from the conditions of this License. If you cannot satisfy
- simultaneously your obligations under this License and any other
- pertinent obligations, then your rights under this License are
- terminated. For example, if an existing agreement would not permit
- royalty-free redistribution of the Music by all those who receive
- copies directly or indirectly through you, then the only way to satisfy
- both it and this License would be to refrain entirely from
- redistributing the Music.
-
- If any portion of this section is held invalid or unenforceable under
- any particular circumstance, the balance of the section is intended to
- apply and the section as a whole is intended to apply in other
- circumstances.
-
- It is not the purpose of this section to induce you to infringe any
- copyright or other property right claims or to contest validity of any
- such claims; this section has the sole purpose of protecting the
- integrity of a music distribution system, which is implemented by
- copyright and license practices.
-
- 7. If an activity permitted by this License is restricted in certain
- countries either for copyright or other reasons, the original copyright
- holder who places the Music under this License may add an explicit
- geographical distribution limitation excluding those countries, so that
- distribution is permitted only in or among countries not thus excluded.
- In such cases, this License incorporates the limitation as if written
- in the body of this License.
-
- 8. Ethymonics may publish revised and or new versions of the Free Music
- License from time to time. Such new versions will be similar in spirit
- to the present version, but may differ in detail to address new
- problems as they arise.
-
- Each License is given a distinguishing version number. If the Music
- specifies a version number of this License which applies to it, and
- "any later version", you have the option of following the terms and
- conditions either of that version or any later version published by
- Ethymonics. If the Music does not specify a version number of this
- License, you may choose any version ever published by Ethymonics.
-
- 9. If you wish to incorporate parts of the Music into another work
- whose distribution conditions are different, write to the composer to
- ask for permission.
-
- END OF FREE MUSIC LICENSE
diff --git a/licenses/GDLS b/licenses/GDLS
deleted file mode 100644
index 6b549088..00000000
--- a/licenses/GDLS
+++ /dev/null
@@ -1,248 +0,0 @@
- MONASH UNIVERSITY
- SCHOOL OF COMPUTER SCIENCE AND SOFTWARE ENGINEERING
- ELECTRONIC DICTIONARY RESEARCH AND DEVELOPMENT GROUP
-
- GENERAL DICTIONARY LICENCE STATEMENT
- Copyright (C) 2003 The Electronic Dictionary Research and Development
-Group, Monash University.
-
-EDRDG Home Page
-
-1. Introduction
-
-In March 2000, James William Breen assigned ownership of the copyright of
-the dictionary files assembled, coordinated and edited by him to the The
-Electronic Dictionary Research and Development Group at Monash University
-(hereafter "the Group"), on the understanding that the Group will foster the
-development of the dictionary files, and will utilize all monies received
-for use of the files for the further development of the files, and for
-research into computer lexicography and electronic dictionaries.
-
-This document outlines the licence arrangement put in place by The Group for
-usage of the files. It replaces all previous copyright and licence
-statements applying to the files.
-
-2. Application
-
-This licence statement and copyright notice applies to the following
-dictionary files, the associated documentation files, and any data files
-which are derived from them.
-
- *
-
- JMDICT - Japanese-Multilingual Dictionary File - the Japanese and
-English components (the German, French and Russian translational equivalents
-are covered by separate copyright held by the compilers of that material.)
- *
-
- EDICT - Japanese-English Electronic DICTionary File
- *
-
- ENAMDICT - Japanese Names File
- *
-
- COMPDIC - Japanese-English Computing and
-Telecommunications Terminology File
- *
-
- KANJIDIC - File of Information about the 6,355 Kanji in the JIS X
-0208 Standard (special conditions apply)
- *
-
- KANJD212 - File of Information about the 5,801 Supplementary Kanji
-in the JIS X 0212 Standard
- *
-
- EDICT-R - romanized version of the EDICT file. (NB: this file has
-been withdrawn from circulation, and all sites carrying it are requested to
-remove their copies.)
-
-Copyright over the documents covered by this statement is held by James
-William BREEN and The Electronic Dictionary Research and Development Group
-at Monash University.
-
-3. Usage, Copying and Distribution Permission and Restrictions
-
-Any person or organization in possession of a copy of any of the files
-covered by this statement, whether they have received the copy via free
-distribution or purchase:
-
- 1.
-
- must as part of the receiving of the copy undertake to be bound by
-all the conditions in this document relating to the distribution or usage of
-the files.
-
- 2.
-
- must undertake not to assert copyright over any portion of the files.
-
- 3.
-
- may use the file for personal purposes such as to assist
-with reading texts, research, translation services, etc.
-
- 4.
-
- may supply extracts or small portions of the files to other persons
-or organizations in the form of written documents, electronic mail, etc.
-
- 5.
-
- may make and distribute verbatim copies of these files provided the
-full documentation of the files and this copyright notice and permission
-notice are distributed with all copies.
-
- 6.
-
- may place copies of these files on WWW, ftp and equivalent servers
-for subsequent distribution provided the full documentation of the files and
-this copyright notice and permission notice are also made available on the
-servers, and are given equivalent notification to potential down-loaders of
-the files. For WWW distribution, there must be links to either local copies
-of the documentation and licence files or to the locations of the files at
-Monash University, and acknowledgement must be made of the source of the
-files.
-
- 7.
-
- may make and distribute extracts or subsets of the files, or files
-in other formats and codings containing material selected from the files,
-under the same conditions applying to verbatim copies. Where a subset of a
-file is being made, either by reducing the number of entries or by reducing
-the amount of information in entries or both, the nature of the subset must
-be made clear in documentation accompanying the distribution of the subset.
-
- 8.
-
- must either make every endeavour to ensure that the versions of the
-files they distribute are the most recent available, or must make the
-version and date clear and prominent in their documentation, WWW page, etc.
-and supply information as to where and how the most recent version may be
-obtained.
-
- 9.
-
- may translate elements of the files into other languages, and to
-make and distribute copies of those translations under the same conditions
-applying to verbatim copies.
-
- 10.
-
- may use these files as part of, or in association with a software
-package or system. Full acknowledgement of the source of the files must be
-made both in the promotional material, WWW pages and software documentation,
-and where the files play a major part in the package, e.g. in the case of
-the package being a dictionary system based on the files, prominent
-reference to the source and status of the files must be made on any GUI
-screens, etc. associated with using the files. In the case of the EDICT,
-JMdict and KANJIDIC files, the following URLs must be used or quoted:
- * http://www.csse.monash.edu.au/~jwb/edict.html
- * http://www.csse.monash.edu.au/~jwb/jmdict.html
- * http://www.csse.monash.edu.au/~jwb/kanjidic.html
-
- 11.
-
-
-may publish all or part of the files on paper or digital media such as
-CD-ROM, provided clear and prominent acknowledgement of the source is made
-in the publication.
-
-Note that in all cases, the addition of material to the files or to extracts
-from the files does not remove or in any way diminish the Group's copyright
-over the files.
-
-Note also that there is no restriction placed on commercial use of the
-files. Where use of the files results in a financial return to the user, it
-is suggested that the user make a donation to the Group to assist with the
-continued development of the files.
-
-4. Warranty and Liability
-
-While every effort has been made to ensure the accuracy of the information
-in the files, it is possible that errors may still be included. The files
-are made available without any warranty whatsoever as to their accuracy or
-suitability for a particular application.
-
-Any individual or organization making use of the files must agree:
-
- 1.
-
- to assume all liability for the use or misuse of the files, and
-must agree not to hold Monash University or the Group liable for any actions
-or events resulting from use of the files.
-
- 2.
-
- to refrain from bringing action or suit or claim against Monash
-University or the Group on the basis of the use of the files, or any
-information included in the files.
-
- 3.
-
- to indemnify Monash University or the Group in the case of action
-by a third party on the basis of the use of the files, or any information
-included in the files.
-
-5. Copyright
-
-Every effort has been made in the compilation of these files to ensure that
-the copyright of other compilers of dictionaries and lexicographic material
-has not been infringed. The Group asserts its intention to rectify
-immediately any breach of copyright brought to its attention.
-
-Any individual or organization in possession of copies of the files, upon
-becoming aware that a possible copyright infringement may be present in the
-files, must undertake to contact the Group immediately with details of the
-possible infringement.
-
-6. Prior Permission
-
-All permissions for use of the files granted by James William Breen prior to
-March 2000 will be honoured and maintained, however the placing of the
-KANJD212 and EDICTH files under the GNU GPL has been withdrawn as of 25
-March 2000.
-
-7. Special Conditions for the KANJIDIC File
-
-In addition to licensing arrangements described above, the following
-additional conditions apply to the KANJIDIC file.
-
-The following people have granted permission for material for which they
-hold copyright to be included in the files, and distributed under the above
-conditions, while retaining their copyright over that material:
-
-Jack HALPERN: The SKIP codes and Frequency codes in the KANJIDIC file.
-
-With regard to the Frequency codes, Mr Halpern has stated as follows: "The
-commercial utilization of the frequency numbers is prohibited without
-written permission from Jack Halpern. Use by individuals and small groups
-for reference and research purposes is permitted, on condition that
-acknowledgement of the source and this notice are included."
-
-With regard to the SKIP codes, Mr Halpern draws your attention to the
-statement he has prepared on the matter.
-
-Christian WITTERN and Koichi YASUOKA: The Pinyin information in the KANJIDIC
-file.
-
-Urs APP: the Four Corner codes and the Morohashi information in the KANJIDIC
-file.
-
-Mark SPAHN and Wolfgang HADAMITZKY: the kanji descriptors from their
-dictionary.
-
-Charles MULLER: the Korean readings.
-
-Joseph DE ROO: the De Roo codes.
-
-8. Enquiries
-
-All enquiries to:
-
-The Electronic Dictionary Research and Development Group
-(Attn: Assoc. Prof. Jim Breen)
-School of Computer Science and Software Engineering
-Monash University
-CLAYTON VIC 3168
-AUSTRALIA
diff --git a/licenses/epubreader b/licenses/epubreader
deleted file mode 100644
index a7338b84..00000000
--- a/licenses/epubreader
+++ /dev/null
@@ -1,54 +0,0 @@
-Custom License
-
-You are free to use EPUBReader with any of the applications or services offered by Mozilla. All Other Rights Reserved.
-
-EPUBReader Firefox Extension: http://www.epubread.com/
-Copyright (C) 2009 Michael Volz (epubread [at] gmail dot com)
-
-TERMS AND CONDITIONS
-
-0. Definitions.
-“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
-
-“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”.
-
-“Licensees” and “recipients” may be individuals or organizations.
-
-To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.
-
-A “covered work” means the unmodified Program.
-
-To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer. Propagation includes copying, distribution, making available to the public, and in some countries other activities as well.
-
-To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
-An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
-
-1. Source Code.
-The “source code” for a work means the preferred form of the work for making modifications to it.
-
-2. Basic Permissions.
-All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program.
-
-3. Modifications.
-You are allowed to modify a covered work for your personal purposes. You are not allowed to convey this modified version.
-
-4. Conveying Verbatim Copies.
-You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
-
-5. Termination.
-You may not propagate a covered work except as expressly provided under this License. Any attempt otherwise to propagate it is void, and will automatically terminate your rights under this License.
-However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
-Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
-Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
-
-6. Acceptance Not Required for Having Copies.
-You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate any covered work. These actions infringe copyright if you do not accept this License. Therefore, by propagating a covered work, you indicate your acceptance of this License to do so.
-
-7. Disclaimer of Warranty.
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-8. Limitation of Liability.
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-9. Interpretation of Sections 7 and 8.
-If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
diff --git a/licenses/googleearth b/licenses/googleearth
deleted file mode 100644
index 01a1b797..00000000
--- a/licenses/googleearth
+++ /dev/null
@@ -1,170 +0,0 @@
-# file generated using the following command (open the link in browser for up-to-date version with html links)
-# lynx -dump http://www.google.com/intl/en/help/terms_maps_earth.html
-
-[1]Google
-
- [2]Skip to content
-
- * [3]Google Maps
- * [4]Help Center
- * [5]Geo Permissions
- * Terms of Service
- + [6]Legal Notices
- + [7]Photos and Videos Policy
- + [8]Legal Notices for Business Listings
-
-Google Maps/Google Earth Additional Terms of Service
-
- Last Modified: December 17, 2015
-
- Thanks for using Google Maps and Google Earth ("Google Maps/Google
- Earth").
-
- Google Maps/Google Earth allow you to view and use a variety of
- content, including map and terrain data, imagery, business listings,
- traffic, reviews, and other related information provided by Google, its
- licensors, and users (the "Content").
-
- By accessing, downloading, or using Google Maps/Google Earth, you are
- agreeing to:
- 1. the [9]Google Terms of Service (the "Universal Terms");
- 2. these Maps/Google Earth additional terms (the "Maps/Earth
- Additional Terms");
- 3. the [10]Google Maps/Google Earth Legal Notices (the "Legal
- Notices"); and
- 4. the [11]Google Privacy Policy (the "Privacy Policy").
-
- Please read each of these four documents carefully, starting with the
- Universal Terms. The Universal Terms clarify, for example, your
- [12]intellectual property ownership rights in the content you upload,
- and your responsibilities when using Google content or [13]third-party
- content or [14]when using Google Maps/Google Earth while driving.
-
- Collectively, we refer to the Universal Terms, the Maps/Earth
- Additional Terms, the Legal Notices, and the Privacy Policy as the
- "Agreement". The Agreement is a binding contract between you and Google
- regarding your use of Google Maps/Google Earth.
- 1. License. Subject to the Agreement's terms, Google grants you a
- non-exclusive, non-transferable license to use Google Maps/Google
- Earth, including features that allow you to:
- a. view and annotate maps;
- b. create KML files and map layers;
- c. publicly display Content with proper attribution online, in
- video, and in print; and
- d. do many other things described in the [15]Using Google Maps,
- Google Earth, and Street View permissions page.
- 2. Prohibited Conduct. When using Google Maps/Google Earth, you may
- not (or allow those acting on your behalf to):
- a. redistribute or sell any part of Google Maps/Google Earth or
- create a new product or service based on Google Maps/Google
- Earth (unless you use the Google Maps/Google Earth APIs in
- accordance with their [16]terms of service);
- b. copy the Content (unless you are otherwise permitted to do so
- by the [17]Using Google Maps, Google Earth, and Street View
- permissions page or applicable intellectual property law,
- including "fair use");
- c. mass download or create bulk feeds of the Content (or let
- anyone else do so);
- d. use Google Maps/Google Earth to create or augment any other
- mapping-related dataset (including a mapping or navigation
- dataset, business listings database, mailing list, or
- telemarketing list) for use in a service that is a substitute
- for, or a substantially similar service to, Google Maps/Google
- Earth;
- e. use any part of Google Maps/Google Earth with other people's
- products or services for or in connection with real-time
- navigation or autonomous vehicle control, except through a
- specific Google-provided feature such as Android Auto or Send
- to Car;
- f. reverse engineer or attempt to extract the source code from
- Google Maps/Google Earth or any related software, except to
- the extent that this restriction is expressly prohibited by
- applicable law;
- g. remove, obscure, or alter any Google terms of service or any
- links to or notices of those terms, or any copyright,
- trademark, or other proprietary rights notices; or
- h. do anything inappropriate, illegal, or in violation of others'
- rights (including their privacy, publicity, and intellectual
- property rights).
- 3. Actual Conditions; Assumption of Risk. When you use Google
- Maps/Google Earth's map data, traffic, directions, and other
- Content, you may find that actual conditions differ from the map
- results and Content, so exercise your independent judgment and use
- Google Maps/Google Earth at your own risk. You’re responsible at
- all times for your conduct and its consequences.
- 4. Your Content in Google Maps/Google Earth. Content you upload,
- submit, store, send, or receive through Google Maps/Google Earth is
- subject to Google’s [18]Universal Terms, including the license in
- the section entitled [19]“Your Content in our Services”. However,
- content that remains exclusively local to your device (such as a
- locally-stored KML file) is not uploaded or submitted to Google,
- and is therefore not subject to that license.
- 5. Government Users. If you are using our Services on behalf of a
- government entity, the following terms apply:
- a. Government Uses of Our Services. The Universal Terms section
- entitled [20]“Business uses of our Services” is replaced in
- its entirety with the following:
- “If you are using our Services on behalf of a government
- entity, that entity accepts these terms. Solely to the extent
- permitted by applicable law, regulation, or privileges and
- immunities, that entity will hold harmless and indemnify
- Google and its affiliates, officers, agents and employees from
- any claim, action or proceedings arising from or related to
- the use of the Services or violation of these terms, including
- any liability or expense arising from claims, losses, damages,
- judgements, litigation costs and legal fees.”
- b. Governing Law.
- i. For city or state government entities in the United
- States and European Union, the Universal Terms section
- regarding governing law and venue will not apply.
- ii. For United States federal government entities, the
- Universal Terms section regarding governing law and venue
- is replaced in its entirety with the following:
- “This Agreement will be governed by and interpreted and
- enforced in accordance with the laws of the United States
- of America without reference to conflict of laws. Solely
- to the extent permitted by federal law: (A) the laws of
- the State of California (excluding California’s conflict
- of laws rules) will apply in the absence of applicable
- federal law; and (B) any dispute arising out of or
- relating to this Agreement or the Services will be
- litigated exclusively in the federal courts of Santa
- Clara County, California, and the parties consent to
- personal jurisdiction in those courts.”
- c. U.S. Government Restricted Rights. All access or use of Google
- Maps/Google Earth by or for the United States federal
- government is subject to the "U.S. Government Restricted
- Rights" section in the [21]Legal Notices.
-
- * [22]Google
- * [23]About Google
- * [24]Privacy
- * [25]Terms
-
-References
-
- 1. https://www.google.com/
- 2. https://www.google.com/help/terms_maps.html#content
- 3. https://maps.google.com/maps
- 4. https://maps.google.com/support/
- 5. https://www.google.com/permissions/geoguidelines.html
- 6. https://www.google.com/help/legalnotices_maps.html
- 7. https://www.support.google.com/contributionpolicy/answer/7422880?hl=en
- 8. https://www.google.com/help/attribution_maps.html
- 9. https://www.google.com/intl/ALL/policies/terms/index.html
- 10. https://www.google.com/help/legalnotices_maps.html
- 11. https://www.google.com/intl/ALL/policies/privacy/index.html
- 12. https://www.google.com/intl/ALL/policies/terms/#toc-content
- 13. https://www.google.com/intl/ALL/policies/terms/#toc-services
- 14. https://www.google.com/intl/ALL/policies/terms/#toc-services
- 15. https://www.google.com/intl/ALL/permissions/geoguidelines.html
- 16. https://developers.google.com/maps/terms
- 17. https://www.google.com/intl/ALL/permissions/geoguidelines.html
- 18. https://www.google.com/intl/ALL/policies/terms/
- 19. https://www.google.com/intl/ALL/policies/terms/#toc-content
- 20. https://www.google.com/intl/ALL/policies/terms/#toc-business-uses
- 21. https://www.google.com/help/legalnotices_maps.html
- 22. https://www.google.com/
- 23. https://www.google.com/intl/en/about/
- 24. https://www.google.com/intl/en/policies/privacy/
- 25. https://www.google.com/intl/en/policies/terms/
diff --git a/media-gfx/ipe/Manifest b/media-gfx/ipe/Manifest
deleted file mode 100644
index d549f583..00000000
--- a/media-gfx/ipe/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ipe-7.2.24-src.tar.gz 1031794 SHA512 4387f5d770e356f7103787c667a5ee9a588f5fa656b96e1cf33051efe62dfdd5fd3bb49f0fcbad5fd1f342e79e3dc110910e6f4a929ed57a6831b867bd84f56d
diff --git a/media-gfx/ipe/ipe-7.2.24.ebuild b/media-gfx/ipe/ipe-7.2.24.ebuild
deleted file mode 100644
index d1d9c5ee..00000000
--- a/media-gfx/ipe/ipe-7.2.24.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-LUA_COMPAT=( lua5-{3..4} )
-
-inherit desktop flag-o-matic lua-single toolchain-funcs
-
-DESCRIPTION="Drawing editor for creating figures in PDF or PS formats"
-HOMEPAGE="http://ipe.otfried.org/"
-SRC_URI="https://github.com/otfried/ipe/releases/download/v${PV}/${PN}-${PV}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-DEPEND="${LUA_DEPS}
- media-fonts/urw-fonts
- media-gfx/libspiro
- media-libs/freetype:2
- media-libs/libjpeg-turbo
- media-libs/libpng
- sys-libs/zlib
- x11-libs/cairo
- dev-qt/qtcore:5
- dev-qt/qtgui:5"
-RDEPEND="${DEPEND}
- || ( app-text/texlive-core net-misc/curl )"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
- filter-flags -fPIE -pie '-flto*' -fwhole-program -Wl,--no-undefined \
- -DNDEBUG -D_GLIBCXX_ASSERTIONS
- sed -i \
- -e 's/fpic/fPIC/' \
- -e "s'\$(IPEPREFIX)/lib'\$(IPEPREFIX)/$(get_libdir)'g" \
- -e "s'\(LUA_CFLAGS.*=\).*'\1 $(lua_get_CFLAGS)'" \
- -e "s'\(LUA_LIBS.*=\).*'\1 $(lua_get_LIBS)'" \
- config.mak || die
- sed -i \
- -e 's!-std=c++1.!!' \
- -e 's/install -s/install/' \
- -e "s'\$(CXX)'\$(CXX) -I${S}/ipecanvas -I${S}/ipecairo -I${S}/include'" \
- common.mak || die
- default
-}
-
-src_compile() {
- emake \
- CXX=$(tc-getCXX) \
- IPEPREFIX="${EPREFIX}/usr" \
- IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html"
-}
-
-src_install() {
- emake install \
- IPEPREFIX="${EPREFIX}/usr" \
- IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html" \
- INSTALL_ROOT="${ED}"
- dodoc ../{news,readme}.txt
- make_desktop_entry ipe Ipe ipe
-}
diff --git a/media-gfx/ipe/metadata.xml b/media-gfx/ipe/metadata.xml
deleted file mode 100644
index 6446d13a..00000000
--- a/media-gfx/ipe/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <longdescription lang="en">
- Ipe is a drawing editor for creating figures in PDF or
- (encapsulated) Postscript format. Ipe supports making small figures
- for inclusion into LaTeX documents as well as making multi-page PDF
- presentations.
-</longdescription>
- <upstream>
- <remote-id type="sourceforge">ipe7</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-gfx/libspiro/Manifest b/media-gfx/libspiro/Manifest
deleted file mode 100644
index c3e7107a..00000000
--- a/media-gfx/libspiro/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libspiro-dist-20200505.tar.gz 422546 SHA512 84627e8925bd6090cd7d234a0b5f3ee109d3341d24c038a0fb1ce4c09ab97fe8fc7eb92bc5df040d559c5ebe3b4fc8f51652a2538e155be9b2f3c78b96b706ee
diff --git a/media-gfx/libspiro/libspiro-20200505-r1.ebuild b/media-gfx/libspiro/libspiro-20200505-r1.ebuild
deleted file mode 100644
index b7c15118..00000000
--- a/media-gfx/libspiro/libspiro-20200505-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="A spline computation library"
-HOMEPAGE="https://github.com/fontforge/libspiro"
-
-SRC_URI="https://github.com/fontforge/libspiro/releases/download/20200505/${PN}-dist-${PV}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-IUSE=""
-RESTRICT=""
-
-src_install() {
- default
- find "${ED}" -type f '(' -name "*.la" -o -name "*.a" ')' -delete || die
-}
diff --git a/media-gfx/libspiro/metadata.xml b/media-gfx/libspiro/metadata.xml
deleted file mode 100644
index b919c846..00000000
--- a/media-gfx/libspiro/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
-</pkgmetadata>
diff --git a/media-gfx/pqiv/ChangeLog b/media-gfx/pqiv/ChangeLog
new file mode 100644
index 00000000..de2c04d7
--- /dev/null
+++ b/media-gfx/pqiv/ChangeLog
@@ -0,0 +1,18 @@
+# ChangeLog for media-gfx/pqiv
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*pqiv-2.2 (12 Jul 2014)
+
+ 12 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump. Remove old ebuild
+
+*pqiv-2.1.1 (21 Feb 2014)
+
+ 21 Feb 2014; Martin Väth <martin@mvath.de>:
+ Version bump. Remove old ebuild
+
+*pqiv-2.0 (18 Oct 2013)
+
+ 18 Oct 2013; Martin Väth <martin@mvath.de>:
+ Bump from tree to allow optional gtk:2 dependency. Remove previous history.
diff --git a/media-gfx/pqiv/Manifest b/media-gfx/pqiv/Manifest
index 1a6d2f92..00d42ffd 100644
--- a/media-gfx/pqiv/Manifest
+++ b/media-gfx/pqiv/Manifest
@@ -1 +1 @@
-DIST pqiv-2.11.tar.gz 139825 SHA512 6017a9d7ed332915a9f6fa788bb02c3b9d4d83c2ae2f9a8ab7d7738caa14ba3e9d253906f2e73fdfd368bb5e7bc51380ee9906fd9921e5f7f113811fd3da66f7
+DIST pqiv-2.2.tar.gz 52414 SHA256 88d625de4437c8e65a49d74e993df5debf224ecf726365e138bf90a602b8b74b SHA512 2f504e228607b4b7b3cb341def5a104c86d932dc93f54b68893acbf5becc9cfa5c4d7549ead8ee25c4cb1f6a3cf13623eb3836e368299de2a21624d9773458bc WHIRLPOOL 0df549d3cc686806413741e453335e7e54f1e194c4296ccc9a72f9b6805b5f83514ee6dbdb45478753c91d36b7baf6b1bf88abb5f84ea9fb1c1bf9643c4fe2f9
diff --git a/media-gfx/pqiv/metadata.xml b/media-gfx/pqiv/metadata.xml
index 286ea225..1dadc3ec 100644
--- a/media-gfx/pqiv/metadata.xml
+++ b/media-gfx/pqiv/metadata.xml
@@ -1,24 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- <description>maintainer of the updates in the mv overlay</description>
- </maintainer>
- <maintainer type="project">
- <email>graphics@gentoo.org</email>
- <name>Gentoo Graphics Project</name>
- </maintainer>
+ <herd>graphics</herd>
<upstream>
- <maintainer>
- <email>phillip.berndt@googlemail.com</email>
- <name>Phillip Berndt</name>
- </maintainer>
- <remote-id type="github">phillipberndt/pqiv</remote-id>
+ <maintainer>
+ <email>phillip.berndt@googlemail.com</email>
+ <name>Phillip Berndt</name>
+ </maintainer>
</upstream>
<use>
- <flag name="archive">Enable support for images in archives and cbX comic book files</flag>
<flag name="gtk2">Use gtk:2 instead of gtk:3</flag>
</use>
</pkgmetadata>
diff --git a/media-gfx/pqiv/pqiv-2.11.ebuild b/media-gfx/pqiv/pqiv-2.11.ebuild
deleted file mode 100644
index a01bac1b..00000000
--- a/media-gfx/pqiv/pqiv-2.11.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit linux-info toolchain-funcs xdg-utils
-
-SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DESCRIPTION="powerful GTK based command-line image viewer with a minimal UI"
-HOMEPAGE="https://github.com/phillipberndt/pqiv http://www.pberndt.com/Programme/Linux/pqiv/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="archive ffmpeg gtk2 imagemagick kernel_linux libav pdf postscript webp"
-
-RDEPEND="
- >=dev-libs/glib-2.32:2
- >=x11-libs/cairo-1.6
- gtk2? ( x11-libs/gtk+:2 )
- !gtk2? ( x11-libs/gtk+:3 )
- archive? ( app-arch/libarchive:0= )
- ffmpeg? (
- !libav? ( media-video/ffmpeg:0= )
- libav? ( media-video/libav:0= )
- )
- imagemagick? ( media-gfx/imagemagick:0= )
- pdf? ( app-text/poppler:0= )
- postscript? ( app-text/libspectre:0= )
- webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-doecho() {
- echo "$@"
- "$@" || die
-}
-
-pkg_setup() {
- if use kernel_linux; then
- CONFIG_CHECK="~INOTIFY_USER"
- linux-info_pkg_setup
- fi
-}
-
-src_configure() {
- local backends="gdkpixbuf" gtkver=3
- ! use gtk2 || gtkver=2
- use archive && backends+=",archive,archive_cbx"
- use ffmpeg || use libav && backends+=",libav"
- use imagemagick && backends+=",wand"
- use pdf && backends+=",poppler"
- use postscript && backends+=",spectre"
- use webp && backends+=",webp"
-
- doecho ./configure \
- --gtk-version=${gtkver} \
- --backends-build=shared \
- --backends=${backends} \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --destdir="${ED}"
-}
-
-src_compile() {
- tc-export CC
- emake VERBOSE=1 CFLAGS="${CFLAGS}"
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/media-gfx/pqiv/pqiv-2.2.ebuild b/media-gfx/pqiv/pqiv-2.2.ebuild
new file mode 100644
index 00000000..31a0a5ca
--- /dev/null
+++ b/media-gfx/pqiv/pqiv-2.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit linux-info toolchain-funcs eutils
+
+DESCRIPTION="Modern rewrite of Quick Image Viewer"
+HOMEPAGE="https://github.com/phillipberndt/pqiv http://www.pberndt.com/Programme/Linux/pqiv/"
+SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk2 kernel_linux"
+
+RDEPEND=">=dev-libs/glib-2.8:2
+ >=x11-libs/cairo-1.6
+ gtk2? ( x11-libs/gtk+:2 )
+ !gtk2? ( x11-libs/gtk+:3 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+pkg_setup() {
+ if use kernel_linux; then
+ CONFIG_CHECK="~INOTIFY_USER"
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ epatch_user
+}
+
+src_configure() {
+ local gtkver=3
+ ! use gtk2 || gtkver=2
+ ./configure --gtk-version=${gtkver} --prefix=/usr --destdir="${D}" || die
+}
+
+src_compile() {
+ tc-export CC
+ emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+ default
+ dodoc README.markdown
+}
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
deleted file mode 100644
index 09706f52..00000000
--- a/media-libs/avidemux-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST avidemux-2.7.8.tar.gz 22080267 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
deleted file mode 100644
index f31cff1e..00000000
--- a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic toolchain-funcs
-
-DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
-
-# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-DEPEND="dev-db/sqlite:3
- nvenc? ( media-video/nvidia_video_sdk )
- sdl? ( media-libs/libsdl:0 )
- system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
- vaapi? ( x11-libs/libva:0= )
- vdpau? ( x11-libs/libvdpau:0 )
- xv? ( x11-libs/libXv:0 )
-"
-RDEPEND="${DEPEND}
- !<media-libs/avidemux-core-${PV}
- !<media-video/avidemux-${PV}
- nls? ( virtual/libintl:0 )
-"
-BDEPEND="virtual/pkgconfig
- nls? ( sys-devel/gettext )
- !system-ffmpeg? ( dev-lang/yasm[nls=] )
-"
-
-S="${WORKDIR}/avidemux2-${PV}"
-CMAKE_USE_DIR="${S}/${PN/-/_}"
-
-src_prepare() {
- cmake_src_prepare
-
- if use system-ffmpeg ; then
- # Preparations to support the system ffmpeg. Currently fails because
- # it depends on files the system ffmpeg doesn't install.
- local error="Failed to remove bundled ffmpeg."
-
- rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
- buildCore/ffmpeg || die "${error}"
- sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
- -i avidemux/commonCmakeApplication.cmake || die "${error}"
- sed -e 's/include(admFFmpegBuild)//g' \
- -i avidemux_core/CMakeLists.txt || die "${error}"
- else
- local ffmpeg_args=(
- --cc=$(tc-getCC)
- --cxx=$(tc-getCXX)
- --ar=$(tc-getAR)
- --nm=$(tc-getNM)
- --ranlib=$(tc-getRANLIB)
- "--optflags='${CFLAGS}'"
- )
-
- sed -i \
- -e "s/@@GENTOO_FFMPEG_FLAGS@@/${ffmpeg_args[*]}/" \
- cmake/ffmpeg_configure.sh.cmake \
- || die
- fi
-}
-
-src_configure() {
- # See bug 432322.
- use x86 && replace-flags -O0 -O1
-
- local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -DGETTEXT="$(usex nls)"
- -DNVENC="$(usex nvenc)"
- -DSDL="$(usex sdl)"
- -DLIBVA="$(usex vaapi)"
- -DVDPAU="$(usex vdpau)"
- -DXVIDEO="$(usex xv)"
- )
-
- use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-}
-
-src_install() {
- cmake_src_install
-}
diff --git a/media-libs/avidemux-core/metadata.xml b/media-libs/avidemux-core/metadata.xml
deleted file mode 100644
index efad95d3..00000000
--- a/media-libs/avidemux-core/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- <name>Gentoo Video project</name>
- </maintainer>
- <use>
- <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
- <flag name="system-ffmpeg">Use the ffmpeg provided by the system.</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">avidemux</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
deleted file mode 100644
index 09706f52..00000000
--- a/media-libs/avidemux-plugins/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST avidemux-2.7.8.tar.gz 22080267 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild
deleted file mode 100644
index 38318d25..00000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="Plugins for the video editor media-video/avidemux"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- ~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
- ~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
- dev-lang/spidermonkey:0=
- dev-libs/libxml2:2
- media-libs/a52dec
- media-libs/libass:0=
- media-libs/libmad
- media-libs/libmp4v2
- media-libs/libpng:0=
- virtual/libiconv
- aac? (
- media-libs/faac
- media-libs/faad2
- )
- aften? ( media-libs/aften )
- alsa? ( media-libs/alsa-lib )
- amr? ( media-libs/opencore-amr )
- dcaenc? ( media-sound/dcaenc )
- dts? ( media-libs/libdca )
- fdk? ( media-libs/fdk-aac:0= )
- fontconfig? ( media-libs/fontconfig:1.0 )
- fribidi? ( dev-libs/fribidi )
- jack? (
- virtual/jack
- libsamplerate? ( media-libs/libsamplerate )
- )
- lame? ( media-sound/lame )
- nvenc? ( amd64? ( media-video/nvidia_video_sdk ) )
- opus? ( media-libs/opus )
- pulseaudio? ( media-sound/pulseaudio )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- truetype? ( media-libs/freetype:2 )
- twolame? ( media-sound/twolame )
- vorbis? ( media-libs/libvorbis )
- vpx? ( media-libs/libvpx:0= )
- x264? ( media-libs/x264:0= )
- x265? ( media-libs/x265:0= )
- xv? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXv
- )
- xvid? ( media-libs/xvid )
-"
-DEPEND="${COMMON_DEPEND}
- oss? ( virtual/os-headers )
-"
-RDEPEND="${COMMON_DEPEND}
- !<media-libs/avidemux-plugins-${PV}
-"
-
-S="${WORKDIR}/avidemux2-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
-
-src_prepare() {
- default
-
- # Don't reapply PATCHES during cmake_src_prepare
- unset PATCHES
-
- processes="buildPluginsCommon:avidemux_plugins
- buildPluginsCLI:avidemux_plugins"
- use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
-
- for process in ${processes} ; do
- CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
- done
-}
-
-src_configure() {
- # See bug 432322.
- use x86 && replace-flags -O0 -O1
-
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
-
- local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
- -DFAAC="$(usex aac)"
- -DFAAD="$(usex aac)"
- -DALSA="$(usex alsa)"
- -DAFTEN="$(usex aften)"
- -DDCAENC="$(usex dcaenc)"
- -DFDK_AAC="$(usex fdk)"
- -DOPENCORE_AMRWB="$(usex amr)"
- -DOPENCORE_AMRNB="$(usex amr)"
- -DLIBDCA="$(usex dts)"
- -DFONTCONFIG="$(usex fontconfig)"
- -DJACK="$(usex jack)"
- -DLAME="$(usex lame)"
- -DNVENC="$(usex nvenc)"
- -DOPENGL="$(usex opengl)"
- -DOPUS="$(usex opus)"
- -DOSS="$(usex oss)"
- -DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
- -DQT4=OFF
- -DFREETYPE2="$(usex truetype)"
- -DTWOLAME="$(usex twolame)"
- -DX264="$(usex x264)"
- -DX265="$(usex x265)"
- -DXVIDEO="$(usex xv)"
- -DXVID="$(usex xvid)"
- -DVDPAU="$(usex vdpau)"
- -DVORBIS="$(usex vorbis)"
- -DLIBVORBIS="$(usex vorbis)"
- -DVPXDEC="$(usex vpx)"
- -DUSE_EXTERNAL_LIBA52=yes
- -DUSE_EXTERNAL_LIBASS=yes
- -DUSE_EXTERNAL_LIBMAD=yes
- -DUSE_EXTERNAL_LIBMP4V2=yes
- )
-
- use qt5 && mycmakeargs+=( -DENABLE_QT5=True )
- use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
- done
-}
-
-src_compile() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_compile
- done
-}
-
-src_install() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_install
- done
-}
diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.20-optional-pulse.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.20-optional-pulse.patch
deleted file mode 100644
index a75f1295..00000000
--- a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.20-optional-pulse.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/cmake/admCheckAudioDeviceLibs.cmake
-+++ b/cmake/admCheckAudioDeviceLibs.cmake
-@@ -158,6 +158,7 @@
-
- MESSAGE(STATUS "Checking for PULSEAUDIOSIMPLE")
- MESSAGE(STATUS "*****************************")
-+ IF (PULSEAUDIOSIMPLE)
- IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
- # in cache already
- SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE)
-@@ -191,6 +192,9 @@
- MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES)
-
- APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE_SIMPLE}")
-+ ELSE (PULSEAUDIOSIMPLE)
-+ MESSAGE("${MSG_DISABLE_OPTION}")
-+ ENDIF (PULSEAUDIOSIMPLE)
- ELSE (UNIX AND NOT APPLE)
- SET(PULSEAUDIOSIMPLE_CAPABLE FALSE)
- ENDIF (UNIX AND NOT APPLE)
diff --git a/media-libs/avidemux-plugins/metadata.xml b/media-libs/avidemux-plugins/metadata.xml
deleted file mode 100644
index 410f7050..00000000
--- a/media-libs/avidemux-plugins/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- <name>Gentoo Video project</name>
- </maintainer>
- <use>
- <flag name="aften">Enable A/52 (AC-3) audio encoder support.</flag>
- <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg>.</flag>
- <flag name="dcaenc">Enable DTS Coherent Acoustics audio encoder support via <pkg>media-sound/dcaenc</pkg>.</flag>
- <flag name="fdk">Adds support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
- <flag name="fribidi">Enable unicode bidirectional algorithm support via <pkg>dev-libs/fribidi</pkg>.</flag>
- <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
- <flag name="opus">Adds support for the Opus codec via <pkg>media-libs/opus</pkg>.</flag>
- <flag name="twolame">Enable TwoLAME support via <pkg>media-sound/twolame</pkg>, an optimised MPEG Audio Layer 2 (MP2) encoder.</flag>
- <flag name="vpx">Enable WebM VP8 Codec SDK support via <pkg>media-libs/libvpx</pkg>.</flag>
- <flag name="x265">Enables HEVC support with <pkg>media-libs/x265</pkg>.</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">avidemux</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-tv/nvtv/Manifest b/media-tv/nvtv/Manifest
deleted file mode 100644
index 6ad5aa8e..00000000
--- a/media-tv/nvtv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nvtv-0.4.7.tar.gz 419564 SHA512 086de916b3b783a2071906e8f2eb98009f2f73627dc75ee086bde9864de3fb18ddf6d981c56225ac3dca3c837ff3575deb2aeca042be4cca9dc7a876cc41282d
diff --git a/media-tv/nvtv/files/nvtv.start b/media-tv/nvtv/files/nvtv.start
deleted file mode 100644
index 72668733..00000000
--- a/media-tv/nvtv/files/nvtv.start
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
- use modules logger
-}
-
-start() {
- ebegin "Starting NVidia TV-Out Server"
- start-stop-daemon --start --quiet --exec /usr/sbin/nvtvd \
- --background 1>&2
- eend $?
-}
-
-stop() {
- ebegin "Stopping NVidia TV-Out Server"
- start-stop-daemon --stop --quiet --exec /usr/sbin/nvtvd 1>&2
- eend $?
-}
diff --git a/media-tv/nvtv/files/respect-cflags.patch b/media-tv/nvtv/files/respect-cflags.patch
deleted file mode 100644
index 2fa991f7..00000000
--- a/media-tv/nvtv/files/respect-cflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-The rest of the build system will respect the user's CFLAGS if we
-don't wipe them out, so just delete the line that does that. The
-removal of the gtk-1.x stuff is so that we can run eautoreconf and
-have it work; we don't support gtk1 in Gentoo anyway.
-
-diff --git a/configure.in b/configure.in
-index f8f48cc..d8f1261 100755
---- a/configure.in
-+++ b/configure.in
-@@ -57,9 +57,6 @@ dnl
- dnl Debugging enables, CFLAGS
- dnl
-
--dnl Clear -g -O2 from CFLAGS
--CFLAGS=""
--
- AC_MSG_CHECKING(for debugging info)
-
- AC_ARG_ENABLE(debug,
-@@ -110,11 +107,6 @@ if test ${with_gtk} = no ; then
- fi
-
- if test ${have_gtk} = no ; then
-- if test ${with_gtk} = yes -o ${with_gtk} = gtk1 ; then
-- AM_PATH_GTK(1.2.0, have_gtk=gtk1)
-- fi
--fi
--if test ${have_gtk} = no ; then
- if test ${with_gtk} = yes -o ${with_gtk} = gtk2 ; then
- AM_PATH_GTK_2_0(2.0.0, have_gtk=gtk2)
- fi
diff --git a/media-tv/nvtv/metadata.xml b/media-tv/nvtv/metadata.xml
deleted file mode 100644
index 3f29b9b2..00000000
--- a/media-tv/nvtv/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <longdescription>TV-Out for NVidia cards</longdescription>
- <upstream>
- <remote-id type="sourceforge">nv-tv-out</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-tv/nvtv/nvtv-0.4.7-r3.ebuild b/media-tv/nvtv/nvtv-0.4.7-r3.ebuild
deleted file mode 100644
index 1ee6c5e4..00000000
--- a/media-tv/nvtv/nvtv-0.4.7-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-IUSE="X gtk"
-
-DESCRIPTION="TV-Out for NVidia cards"
-HOMEPAGE="https://sourceforge.net/projects/nv-tv-out/"
-SRC_URI="mirror://sourceforge/nv-tv-out/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-apps/pciutils[-zlib]
- gtk? ( x11-libs/gtk+:2 )
- X? ( x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXxf86vm )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="X? ( x11-base/xorg-proto )"
-
-PATCHES=( "${FILESDIR}/respect-cflags.patch" )
-
-src_prepare() {
- default
- sed -e 's/^\(.*_WXCONFIG.*\)/#\1/' -- configure.in >configure.ac || die
- rm -- configure.in || die
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with gtk) $(use_with X x)
-}
-
-src_install() {
- dobin src/nvtv
- dosbin src/nvtvd
- dodoc ANNOUNCE BUGS FAQ README doc/*.txt doc/USAGE
- newinitd "${FILESDIR}"/nvtv.start nvtv
-}
diff --git a/media-tv/sundtek-tv/ChangeLog b/media-tv/sundtek-tv/ChangeLog
new file mode 100644
index 00000000..b6da508d
--- /dev/null
+++ b/media-tv/sundtek-tv/ChangeLog
@@ -0,0 +1,167 @@
+# ChangeLog for media-video/sundtek-tv
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*sundtek-tv-151002.142741 (02 Oct 2015)
+
+ 02 Oct 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-150907.163414 (20 Sep 2015)
+
+ 20 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-150728.175535 (05 Sep 2015)
+
+ 05 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-150716.005115 (17 Jul 2015)
+
+ 07 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-150411.190910 (07 Jun 2015)
+
+ 07 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Make /etc/ld.so.preload optional:
+ Introduce USE=ld-preload-file and USE=ld-preload-env and output usage details
+
+*sundtek-tv-150411.190910 (15 Apr 2015)
+
+ 15 Apr 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-150310.134458 (10 Mar 2015)
+
+ 10 Mar 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-150219.053827 (20 Feb 2015)
+
+ 20 Feb 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-150125.105350 (26 Jan 2015)
+
+ 26 Jan 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-150111.155129 (16 Jan 2015)
+
+ 16 Jan 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix QA message
+
+*sundtek-tv-141222.213801 (25 Dec 2014)
+
+ 27 Dec 2014; Martin Väth <martin@mvath.de>:
+ Add blocker to <openrc-0.13
+
+ 25 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-141209.042745 (12 Dec 2014)
+
+ 12 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-141111.122431 (11 Nov 2014)
+
+ 11 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-141016.181612 (19 Oct 2014)
+
+ 19 Oct 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-140918.104249 (20 Sep 2014)
+
+ 20 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-140727.221230 (29 Jul 2014)
+
+ 29 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-140715.054711 (16 Jul 2014)
+
+ 16 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-140711.143644 (13 Jul 2014)
+
+ 13 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-140701.143639 (07 Jul 2014)
+
+ 07 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-140629.115654 (29 Jun 2014)
+
+ 29 Jun 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-140601.005015 (03 Jun 2014)
+
+ 03 Jun 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-140528.222950 (29 May 2014)
+
+ 29 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. openat() fixed on 32 bit: tar-1.27.1 works.
+ Thanks again to the Sundtek support!
+
+*sundtek-tv-140517.123345 (24 May 2014)
+
+ 24 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-140510.143826-r1 (12 May 2014)
+
+ 12 May 2014; Martin Väth <martin@mvath.de>:
+ Add check for INPUT_UINPUT ball. Thanks again to the Sundtek support!
+
+*sundtek-tv-140510.143826 (11 May 2014)
+
+ 11 May 2014; Martin Väth <martin@mvath.de>:
+ Move to versioned tarball support. Thanks to the Sundtek support!
+
+*sundtek-tv-20150510 (11 May 2014)
+
+ 11 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-20150428 (04 May 2014)
+
+ 04 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Avoid install -r
+
+*sundtek-tv-20150414 (14 Apr 2014)
+
+ 14 Apr 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sundtek-tv-20150402 (13 Apr 2014)
+
+ 13 Apr 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Remove IUSE=doc
+
+*sundtek-tv-20150321-r1 (17 Feb 2014)
+
+ 30 Mar 2014; Martin Väth <martin@mvath.de>:
+ Support mediaclient.{video,audio,dvb} wrapper scripts;
+ provide local systemd service for default settings
+
+*sundtek-tv-20150321 (17 Feb 2014)
+
+ 29 Mar 2014; Martin Väth <martin@mvath.de>:
+ Add zsh completion support. Version bump
+
+ 17 Feb 2014; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch.
diff --git a/media-tv/sundtek-tv/Manifest b/media-tv/sundtek-tv/Manifest
index 85ee5e70..7ef6c46e 100644
--- a/media-tv/sundtek-tv/Manifest
+++ b/media-tv/sundtek-tv/Manifest
@@ -1 +1 @@
-DIST sundtek_installer_210407.172308.sh 45280775 SHA512 a1f36261b465815d8b454d2f8cb368fd1b3ed59d0f492e8ede0dce77c18d6fba9f726170af48acd2ef1b85ed15efbb06b2ef3f5ad896add8f621cd0b90a2ae30
+DIST sundtek_installer_151002.142741.sh 28592676 SHA256 16441a0c5e0ab02a5b66c992370f49f13a2cb24d591ffa3834c53204bf1ec507 SHA512 044786e76d48123cfc0c111bb17513cef5d68003052b588d02650323d5a2a9f782332080a4399391969356021eb102ac26372cdfbd44e475c447ebb273acaf51 WHIRLPOOL e00eece7d100e88b08855960a6d27e74fc72dd38f2a82df1bfefa61c1e84789a9611666b4e9bd646662522a53bd137cf3bdc0eb5dd91e4dd3082cc3624f2e243
diff --git a/media-tv/sundtek-tv/files/_mediaclient b/media-tv/sundtek-tv/files/_mediaclient
index dc0952d8..3d0ed826 100644
--- a/media-tv/sundtek-tv/files/_mediaclient
+++ b/media-tv/sundtek-tv/files/_mediaclient
@@ -5,122 +5,120 @@ local service_opts
service_opts=(
'--help[help]'
{'(--enumdevices)-e','(-e)--enumdevices'}'[show up devices]'
-{'(--mode)-m+','(-m)--mode='}'[use specified device mode]:device mode:(DVBT DVBT2 DVBC DVBS DVBS2 ATSC ATV RADIO)'
-{'(--tuner)-t+','(-t)--tuner'}'[use specified tuner id]:tuner id:->tunerid'
-{'(--setdtvmode)-D+','(-D)--setdtvmode='}'[use specified dtv mode]:dtv mode:(DVBT DVBT2 DVBC ATSC)'
+{'(--mode)-m+','(-m)--mode='}'[MODE (device mode)]:device mode:(DVBT DVBT2 DVBC DVBS DVBS2 ATSC ATV RADIO)'
+{'(--tuner)-t+','(-t)--tuner'}'[ID (tuner id)]:tuner id:->tunerid'
+{'(--setdtvmode)-D+','(-D)--setdtvmode='}'[MODE (dtv mode)]:dtv mode:(DVBT DVBC ATSC)'
{'(--listatvstd)-L','(-L)--listatvstd'}'[list analog TV standards]'
-'--crc=[switch crc check for PSI to specified status]:check active:(on off)'
-{'(--vmode)-v+','(-v)--vmode='}'[set analog TV to specified mode]:tv mode:(PAL-BG PAL-DK PAL-I PAL-M NTSC-M Secam-L Secam-LC Secam-K Secam-B Secam-G Secam-H)'
-'--setvcr=[lock specified device]:video device:(/dev/video*)'
+'--crc=[MODE (crc check for PSI on/off)]:check active:(on off)'
+{'(--vmode)-v+','(-v)--vmode='}'[MODE (set analog TV mode)]:tv mode:(PAL-BG PAL-DK PAL-I PAL-M NTSC-M Secam-L Secam-LC Secam-K Secam-B Secam-G Secam-H)'
+'--setvcr=[DEVICE (lock device)]:video device:(/dev/video*)'
{'(--inputs)-i','(-i)--inputs'}'[list analog TV inputs]'
-{'(--size)-s+','(-s)--size='}'[sec scalar size to specified dimension]:dimension:(720x576)'
-{'(--Input)-I+','(-I)--Input='}'[set specified TV inut]:input:(Television Composite S-Video)'
-{'(--frequency)-f+','(-f)--frequency='}'[set specified frequency in Hz]:frequency in Hz:()'
-'--rawfreq=[set specified raw DVB-S/S2 frequency in khz]:frequency in khz:()'
+{'(--size)-s+','(-s)--size='}'[DIM (set scalar size)]:dimension:(720x576)'
+{'(--Input)-I+','(-I)--Input='}'[INPUT (set TV input)]:input:(Television Composite S-Video)'
+{'(--frequency)-f+','(-f)--frequency='}'[HZ (frequency)]:frequency:()'
+'--rawfreq[HZ (raw DVB-S/S2 frequency)]:frequency:()'
{'(--listarea)-a','(-a)--listarea'}'[list Area]'
-{'(--setarea)-A+','(-A)--setarea='}'[set specified area)]:Area:()'
-{'(--Modulation)-M+','(-M)--Modulation='}'[set specified modulation (DVB-C)]:Modulation:(Q16 Q32 Q64 Q128 Q256)'
-{'(--Symbolrate)-S+','(-S)--Symbolrate='}'[set specified symbolrate in Hz (DVB-C)]:Symbolrate:()'
-{'(--voltage)-V+','(-V)--voltage='}'[set specified DVB-S/S2 polarisation voltage]:voltage:->voltage'
-'--band=[set specified band]:band:(C-BAND UNIVERSAL)'
+{'(--setarea)-A+','(-A)--setarea='}'[AREA (set Area)]:Area:()'
+{'(--Modulation)-M+','(-M)--Modulation='}'[MODULATION (for DVB-C)]:Modulation:(Q16 Q32 Q64 Q128 Q256)'
+{'(--Symbolrate)-S+','(-S)--Symbolrate='}'[HZ (Symbolrate for DVB-C)]:Symbolrate:()'
+{'(--voltage)-V+','(-V)--voltage='}'[VOLTAGE (DVB-S/S2 Polarisation)]:voltage:->voltage'
+'--band=[BAND (set band)]:band:(C-BAND UNIVERSAL)'
{'(--fec)-E','(-E)--fec'}'[forward error connection]'
-{'(--polarisation)-p+','(-p)--polarisation='}'[set specified polarization direction]:polarisation:->polarisation'
-{'(--bandwidth)-b+','(-b)--bandwidth='}'[set specified bandwith for DVB-T in MHZ]:bandwidth:(6 7 8)'
+{'(--polarisation)-p+','(-p)--polarisation='}'[DIRECTION (polarisation)]:polarisation:->polarisation'
+{'(--bandwidth)-b+','(-b)--bandwidth='}'[MHZ (set bandwidth for DVB-T)]:bandwidth:(6 7 8)'
{'(--rds)-r','(-r)--rds'}'[get RDS information]'
{'(--properties)-C','(-C)--properties'}'[list device properties]'
-'--loglevel=[set specified log verbosity]:loglevel:(off min max)'
-'--signalreporting=[set specified signal mode]:signal reporting:->signalreporting'
-'--readsignal=[read signalstrength specified number of times)]:signalstrength:()'
-'--powerlevel=[read powerlevel specified number of times)]:powerlevel:()'
+'--loglevel=[LOGLEVEL (set log verbosity)]:loglevel:(off min max)'
+'--signalreporting=[MODE (set signal mode)]:signal reporting:->signalreporting'
+'--readsignal=[N (read signalstrength N times)]:signalstrength:()'
+'--powerlevel=[N (read powerlevel N times)]:powerlevel:()'
+'--powerlevel=[N (read powerlevel N times)]:powerlevel:()'
'--lockstatus[check dvb/atsc channel lock]'
-'--enable5v=[switch specified 5V output to specified on/off (DVB-C/T/T2)]:enable 5V output:(on off)'
-'--sid=[select specified service id (use with -f) (DAB/DAB+)]:service id:()'
-'--scandabservices=[scan DAB/DAB+ frequency on specified device]:debdevice:()'
-'--scandabfrequencies=[scan DAB/DAB+ frequency on specified device]:debdevice:()'
-'--wssdecoder=[use VBU for wss for specified VBI device]:VBI device:(dev/vbi*)'
-'--dumpvbi=[dump VBI of specified device]:VBI device:(dev/vbi*)'
-'--wsscallback=[Aspect ratio change wss use specified script]:aspect ratio script:_files'
+'--enable5v=[5V output for DVB-C/T/T2]:enable 5V output:(on off)'
+'--wssdecoder=[DEVICE (VBI for wss)]:VBI device:(dev/vbi*)'
+'--dumpvbi=[DEVICE (dump VBI for wss)]:VBI device:(dev/vbi*)'
+'--wsscallback=[SCRIPT (Aspect ratio change wss)]:aspect ratio script:_files'
'--stopwdd[stop background wss server]'
'--cc-list[list closed caption]'
'--cc-flush[clear closed caption settings]'
-'--cc-enable[enable specified closed caption]:closed caption:(CC1 CC2 T1 T2)'
-'--cc-disable[disable specified closed caption]:closed caption:(CC1 CC2 T1 T2)'
-{'(--pidfilter)-P+','(-P)--pidfilter='}'[set DVB pidfilter to specified on/off)]:pidfilter:(on off)'
-{'(--addpid)-H+','(-H)--addpid='}'[add specified DVB pids]:pids:("0x10" 16 "0x10,16")'
-{'(--removepid)-x+','(-x)--removepid='}'[remove specified DVB pids]:pids:("0x10" 16 "0x10,16")'
+'--cc-enable[CAP (enable closed caption)]:closed caption:(CC1 CC2 T1 T2)'
+'--cc-disable[CAP (disable closed caption)]:closed caption:(CC1 CC2 T1 T2)'
+{'(--pidfilter)-P+','(-P)--pidfilter='}'[MODE (DVB pidfilter on/off)]:pidfilter:(on off)'
+{'(--addpid)-H+','(-H)--addpid='}'[PIDS (add DVB pids)]:pids:("0x10" 16 "0x10,16")'
+{'(--removepid)-x+','(-x)--removepid='}'[PIDS (remove DVB pids)]:pids:("0x10" 16 "0x10,16")'
{'(--listpids)-w','(-w)--listpids'}'[list filtered DVB pids]'
-{'(--flushpids)-F+','(-F)--flushpids='}'[flush specified DVB pidtable]'
-'--softpidfilter=[set software DVB PID filter to specified mode]:pidfilter mode:(on off passthrough)'
-{'(--internalaudio)-c+','(-c)--internalaudio='}'[set internal audio to specified mode]:internal audio:->internalaudio'
-'--audiothreshold=[set audio threshold to specified ms]:audio threshold:(0 2000)'
-'--loudness=[set loudness to specified level (0-15)]:loudness:(0 15)'
-'--volume=[set volume to specified level (0-255)]:volume:(0 255)'
-'--treble=[set treble to specified level (0-255)]:treble:(0 255)'
-'--audiomode=[set specified mono/stereo audio]:audio mode:(mono stereo)'
-{'(--mute)-g+','(-g)--mute='}'[set FM mute to specified on/off]:FM mute mode:(on off)'
-'--diseqc-support=[specified disqc mode]:diseqc mode:(on off)'
-'--diseqc=[specified diseqc command]:diseqc command:(E0 10 38 F0)'
+{'(--flushpids)-F+','(-F)--flushpids='}'[flush DVB pidtable]'
+'--softpidfilter=[MODE (software DVB PID filter)]:pidfilter mode:(on off passthrough)'
+{'(--internalaudio)-c+','(-c)--internalaudio='}'[MODE (internal audio)]:internal audio:->internalaudio'
+'--audiothreshold=[N (audio threshold N ms)]:audio threshold:(0 2000)'
+'--loudness=[N (loudness)]:loudness:(0 15)'
+'--volume=[N (volume)]:volume:(0 255)'
+'--treble=[N (treble)]:treble:(0 255)'
+'--audiomode=[MODE (mono/stereo)]:audio mode:(mono stereo)'
+{'(--mute)-g+','(-g)--mute='}'[MODE (FM mute)]:FM mute mode:(on off)'
+'--diseqc-support=[MODE (diseqc)]:diseqc mode:(on off)'
+'--diseqc=[COMMAND (diseqc)]:diseqc command:(E0 10 38 F0)'
'--list-diseqc[list diseqc dish configuration]'
-'--set-diseqc=[set diseqc dish specified configuration]:diseqc dish configuration:(S19.2E)'
-'--setmini=[set burs to specified SEC_MINI_A/B]:burst tone:(A B)'
+'--set-diseqc=[CONFIG (set diseqc dish)]:diseqc dish configuration:(S19.2E)'
+'--setmini=[SEC_MINI_A/B (set burst tone)]:burst tone:(A B)'
{'(--listrc)-l','(-l)--listrc'}'[list rc protocols]'
-{'(--setrc)-s+','(-s)--setrc='}'[set specified rc protocol]:protocol:()'
-'--enablerc=[enable rc polling on specified device]:rc device:(/dev/mediainput*)'
-'--disablerc=[disable rc polling on specified device]:rc device:(/dev/mediainput*)'
+{'(--setrc)-s+','(-s)--setrc='}'[PROTOCOL (set rc)]:protocol:()'
+'--enablerc=[DEVICE (enable rc polling)]:rc device:(/dev/mediainput*)'
+'--disablerc=[DEVICE (disable rc polling)]:rc device:(/dev/mediainput*)'
'--pollrc[poll raw rc]'
'--dumprcmap[dump rc map]'
-'--setrcmap=[use specified file as rc map]:rc map:_files'
+'--setrcmap=[MAP (set rc MAP)]:rc map:_files'
'--updaterc=[update rc layout]:rc layout:->rclayout'
-'--transfermode=[set specified usb transfer mode]:transfer mode:(bulk iso)'
-'--nullpackets=[set specified usb null packets mode]:pass null packets:->nullpackets'
-'--bulkpackets=[set usb bulk transfer to specified number]:bulk transfer number:()'
-'--ts-settle-timemout=[set usb timeout to specified ms]:timeout:(0 4000)'
-'--disable-dvb=[disable specified dvb adapter]:dvb adapter:(/dev/dvb/adapter*)'
-'--enable-dvb=[enable specified dvb adapter]:dvb adapter:(/dev/dvb/adapter*)'
-'--setver=[set specifified DVB API]:DVB API:(5.0)'
-'--vfilter=[set specified analog deinterlacer mode]:deinterlacer:(on off)'
-'--vfilterid=[set analog dinterlacer type to specified id]:deinterlacer id:->deinterlacerid'
+'--transfermode=[MODE (usb transfer mode)]:transfer mode:(bulk iso)'
+'--nullpackets=[MODE (usb null packets)]:pass null packets:->nullpackets'
+'--bulkpackets=[N (usb bulk transfer)]:bulk transfer number:()'
+'--ts-settle-timemout=[N (usb timeout in ms)]:timeout:(0 4000)'
+'--disable-dvb=[ADAPTER (disable dvb)]:dvb adapter:(/dev/dvb/adapter*)'
+'--enable-dvb=[ADAPTER (enable dvb)]:dvb adapter:(/dev/dvb/adapter*)'
+'--setver=[API (set DVB API)]:DVB API:(5.0)'
+'--vfilter=[MODE (analog deinterlacer)]:deinterlacer:(on off)'
+'--vfilterid=[ID (analog deinterlacer type)]:deinterlacer id:->deinterlacerid'
'--lc[list connected clients]'
-'--lc=[disconnect client with specified pid]:pid:_pids'
+'--lc=[PID (disconnect client)]:pid:()'
'--shutdown[shutdown multimediastack]'
-'--start=[start multimediastack in specified seconds]:seconds:(1)'
+'--start=[N (start multimediastack in N sec)]:seconds:(1)'
'--systemdcheck[start via systemd]'
'--wait-for-devices[start when devices are ready]'
-'--enablenetwork=[set network listening to specified on/off]:network mode:(on off)'
-'--mount=[create virtual specified adapter]:virtual adapter:->createmount'
-'--unmount=[delete virtual specified adapter]:virtual adapter:(1)'
-'--lrc=[lst specified remote clients (rc)]:rc clients:(1 192.168.1.2:0)'
+'--enablenetwork=[MODE (network listening)]:network mode:(on off)'
+'--mount=[ADAPTER (create virtual)]:virtual adapter:->createmount'
+'--unmount=[ADAPTER (delete virtual)]:virtual adapter:(1)'
+'--lrc=[RC (list remote clients)]:rc clients:(1 192.168.1.2:0)'
'--tvdummy[add tv-dummydevice]'
-'--remove=[delete specified dummy adapter]:dummy adapter:(1)'
+'--remove=[N (delete dummy adapter)]:dummy adapter:(1)'
'--scan-network[scan for IPTV devices]'
-'--nettransfermode=[set transfer to specified mode]:transfer mode:(tcp udp)'
-'--nti=[increase maximum package to specified number]:maximum packet:(0 10000)'
-'--netrecoverymode=[set specified net recover mode]:net recover mode:(on off)'
-'--enabledreambox=[connect vtuner to specified device]:vtuner device:(/dev/dvb/adapter*/frontend*)'
-'--disabledreambox=[disconnect vtuner from specified device]:vtuner device:(/dev/dvb/adapter*/frontend*)'
+'--nettransfermode=[MODE (set transfer mode)]:transfer mode:(tcp udp)'
+'--nti=[N (increase maximum packet)]:maximum packet:(0 10000)'
+'--netrecoverymode=[MODE (netrecoverymode)]:net recover mode:(on off)'
+'--enabledreambox=[DEVICE (connect vtuner)]:vtuner device:(/dev/dvb/adapter*/frontend*)'
+'--disabledreambox=[DEVICE (disconnect vtuner)]:vtuner device:(/dev/dvb/adapter*/frontend*)'
'--nimbus[display dreambox nimbus]'
-'--avoffset=[set dreambox AV offset to specified ms]:AV PTS offset:()'
-'--audiooffset=[set dreambox audio offset to specified ms]:Audio PTS offset:()'
-'--videooffset=[set dreambox video offset to specified ms]:Video PTS offset:()'
-'--portforward=[set debugging to specified port]:port:()'
-'--pipecount=[read stdin specified seconds]:seconds:(1)'
-'--cat=[read specified file]:file:_files'
-'--strings=[strings specified file]:file:_files'
-'--lsusb=[print usb ids on specified device]:usb device:(/dev/bus/usb)'
-'--reset=[reset specified usb device]:usb device:(/dev/bus/usb/*)'
-'--tsscan=[scan channel on specified device]:transponder:(/dev/dvb/adapter*/dvr*)'
-'--nitscan=[scan NIT on specified device]:transponder:(/dev/dvb/adapter*/dvr*)'
-'--blindscan=[blindscan specified device]:transponder:(nim_socket /dev/dvb/adapter*/dvr*)'
-'--timeout=[set nitscan timeout to specified ms)]:timeout:()'
-'--zf=[set specified ZF/IF universal frequency]:frequency:()'
-'--frontendinfo=[get DVB API of specified device]:dvb device:(/dev/dvb/adapter*/frontend*)'
+'--avoffset=[N (dreambox AV offset in ms)]:AV PTS offset:()'
+'--audiooffset=[N (dreambox audio offset in ms)]:Audio PTS offset:()'
+'--videooffset=[N (dreambox video offset in ms)]:Video PTS offset:()'
+'--portforward=[N (debugging)]:port:()'
+'--pipecount=[N (read stdin)]:seconds:(1)'
+'--cat=[FILE (read FILE)]:file:_files'
+'--strings=[FILE (strings FILE)]:file:_files'
+'--lsusb=[DEVICE (print usb ids)]:usb device:(/dev/bus/usb)'
+'--reset=[DEVICE (reset usb device)]:usb device:(/dev/bus/usb/*)'
+'--tsscan=[DEVICE (scan channel)]:transponder:(/dev/dvb/adapter*/dvr*)'
+'--nitscan=[DEVICE (scan NIT)]:transponder:(/dev/dvb/adapter*/dvr*)'
+'--blindscan=[DEVICE (blindscan)]:transponder:(nim_socket /dev/dvb/adapter*/dvr*)'
+'--timeout=[N (nitscan timeout in ms)]:timeout:()'
+'--zf=[N (ZF/IF universal frequesncy)]:frequency:()'
+'--frontendinfo=[DEVICE (get DVB API)]:dvb device:(/dev/dvb/adapter*/frontend*)'
'--createadapter[create dvb loopback]'
-'--remove=[remove dvb loopback of specified device]:loopback device:()'
+#'--remove=[N (remove dvb loopback)]:loopback device:()'
)
case $service in
(*mediaclient)
service_opts+=(
-{'(--device)-d+','(-d)--device='}'[use specified video device]:video device:(/dev/dvb/adapter*/frontend* /dev/radio* /dev/video*)'
+{'(--device)-d+','(-d)--device='}'[DEVICE (video device)]:video device:(/dev/dvb/adapter*/frontend* /dev/radio* /dev/video*)'
);
esac
_arguments -C -s -S -A '-*' : $service_opts
@@ -132,7 +130,8 @@ case $state in
'0:FM receiver'
'1:FM transmitter'
)
- _describe -t tunerid 'tuner id' tunerids && ret=0;;
+ _describe -t tunerid 'tuner id' tunerids
+ ret=$?;;
(voltage)
local voltages
voltages=(
@@ -140,21 +139,24 @@ case $state in
'V:13V'
'OFF:0V'
)
- _describe -t voltage 'voltage' voltages && ret=0;;
+ _describe -t voltage 'voltage' voltages
+ ret=$?;;
(polarisation)
local polarisations
polarisations=(
'H:horizontal'
'V:vertical'
)
- _describe -t polarisation 'polarisation' polarisations && ret=0;;
+ _describe -t polarisation 'polarisation' polarisations
+ ret=$?;;
(signalreporting)
local signalreport
signalreport=(
'0:videodecoder (fast, default)'
'1:demodulator (slow, detailed)'
)
- _describe -t signalreporting 'signal reporting' signalreport && ret=0;;
+ _describe -t signalreporting 'signal reporting' signalreport
+ ret=$?;;
(internalaudio)
local internalaudios
internalaudios=(
@@ -163,33 +165,38 @@ case $state in
'external:require external application'
'audioonly:only initialize audio transfer'
)
- _describe -t internalaudio 'internal audio' internalaudios && ret=0;;
+ _describe -t internalaudio 'internal audio' internalaudios
+ ret=$?;;
(rclayout)
local rclayouts
rclayouts=(
'0:internal keymap for flat remote control'
'1:internal keymap for black VCR remote control'
)
- _describe -t rclayout 'rc layout' rclayouts && ret=0;;
+ _describe -t rclayout 'rc layout' rclayouts
+ ret=$?;;
(nullpackets)
local nullpackets
nullpackets=(
'on'
'off:default'
)
- _describe -t nullpackets 'pass null packets' nullpackets && ret=0;;
+ _describe -t nullpackets 'pass null packets' nullpackets
+ ret=$?;;
(deinterlacerid)
local deinterlacerids
deinterlacerids=(
'0:default'
)
- _describe -t deinterlacerid 'deinterlacer id' deinterlacerids && ret=0;;
+ _describe -t deinterlacerid 'deinterlacer id' deinterlacerids
+ ret=$?;;
(createmount)
local virtualadapters
virtualadapters=(
'0:local device'
'192.168.1.2:0:remote device'
)
- _describe -t virtualadapter 'virtual adapter' virtualadapters && ret=0;;
+ _describe -t virtualadapter 'virtual adapter' virtualadapters
+ ret=$?;;
esac
return ret
diff --git a/media-tv/sundtek-tv/files/sundtek.initd b/media-tv/sundtek-tv/files/sundtek.initd
index 9faf7db2..315da43e 100644
--- a/media-tv/sundtek-tv/files/sundtek.initd
+++ b/media-tv/sundtek-tv/files/sundtek.initd
@@ -4,26 +4,14 @@ description="sundtek TV mediaclient"
#command=/opt/bin/mediasrv
#command_args="-d --pluginpath /opt/bin"
-set_preload() {
- yesno ${preload:-NO} || return 0
- LD_PRELOAD=${preload_lib:-/usr/lib}/libmediaclient.so${LD_PRELOAD:+\ }${LD_PRELOAD-}
- export LD_PRELOAD
-}
-
start() {
- ebegin "Starting $SVCNAME"
- (
- set_preload
- /opt/bin/mediaclient --start=4
- )
+ ebegin "Starting ${SVCNAME}"
+ /opt/bin/mediaclient --start=4
eend $?
}
stop() {
- ebegin "Stopping $SVCNAME"
- (
- set_preload
- timeout -k "${killtime:-15}" "${termtime:-15}" /opt/bin/mediaclient --shutdown
- )
+ ebegin "Stopping ${SVCNAME}"
+ /opt/bin/mediaclient --shutdown
eend $?
}
diff --git a/media-tv/sundtek-tv/metadata.xml b/media-tv/sundtek-tv/metadata.xml
index 9f3087a2..3a906d81 100644
--- a/media-tv/sundtek-tv/metadata.xml
+++ b/media-tv/sundtek-tv/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/media-tv/sundtek-tv/sundtek-tv-210407.172308.ebuild b/media-tv/sundtek-tv/sundtek-tv-151002.142741.ebuild
index e680b236..2025ee3f 100644
--- a/media-tv/sundtek-tv/sundtek-tv-210407.172308.ebuild
+++ b/media-tv/sundtek-tv/sundtek-tv-151002.142741.ebuild
@@ -1,25 +1,25 @@
-# Copyright 2014-2021 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
-inherit linux-info pax-utils readme.gentoo-r1 systemd unpacker
+EAPI=5
+inherit eutils linux-info pax-utils readme.gentoo systemd unpacker
# The following variable is only for testing purposes. Leave it to "false"
keep_original=false
DESCRIPTION="Sundtek MediaTV Pro III Drivers"
-HOMEPAGE="http://support.sundtek.com/index.php/topic,2.0.html
-http://sundtek.de/media/latest.phtml"
+HOMEPAGE="http://support.sundtek.com/index.php/topic,2.0.html"
+# Current version number can be found in http://sundtek.de/media/latest.phtml
SRC_URI="http://www.sundtek.de/media/sundtek_installer_${PV}.sh"
-RESTRICT="binchecks mirror strip"
+RESTRICT="mirror strip"
LICENSE="sundtek"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="ld-preload-env +ld-preload-file pax_kernel pulseaudio split-usr"
-RDEPEND="!<sys-apps/openrc-0.13
-pulseaudio? ( media-sound/pulseaudio )"
-BDEPEND="pax_kernel? ( || ( sys-apps/elfix sys-apps/paxctl ) )"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="ld-preload-env +ld-preload-file pax_kernel"
+RDEPEND="!<sys-apps/openrc-0.13"
+DEPEND="pax_kernel? ( || ( sys-apps/elfix sys-apps/paxctl ) )"
DISABLE_AUTOFORMATTING="true"
DOC_CONTENTS="To initialize sundtek drivers during booting call
@@ -28,6 +28,8 @@ DOC_CONTENTS="To initialize sundtek drivers during booting call
You will probably need to adapt sundtek-local.service to your defaults
"
+QA_PREBUILT="opt/bin/* opt/bin/*/* usr/$(get_libdir)/* usr/share/doc/*/*/*"
+
src_unpack() {
local subdir a
a="${S}/archives"
@@ -76,12 +78,7 @@ src_prepare() {
mybinprefix="opt"
mypkgconfig="usr/share/pkgconfig"
myinclsundtek="${myinclude}/sundtek"
- if use split-usr
- then myudev="lib/udev"
- myrootlib="lib"
- else myudev="usr/lib/udev"
- myrootlib="usr/lib"
- fi
+ myudev="lib/udev"
mylirc="etc/lirc"
umask 022
if use pax_kernel
@@ -89,9 +86,8 @@ src_prepare() {
pax-mark e opt/bin/mediaclient
fi
mv opt 1 || die
- mkdir -p ${myusr} "${mybinprefix}" "${myrootlib}" "${mypkgconfig}" \
- "${mylirc}" 1/lib/pm-utils || die
- use pulseaudio || rm 1/bin/audio/libpulse.so || die
+ mkdir -p ${myusr} "${mybinprefix}" lib "${mypkgconfig}" "${mylirc}" \
+ 1/lib/pm-utils || die
mv 1/bin "${mybinprefix}" || die
${keep_original} || mv 1/lib/pm 1/lib/pm-utils/sleep.d || die
mv 1/lib "${mylibdir}" || die
@@ -102,13 +98,8 @@ src_prepare() {
1/doc/libmedia.pc >"${mypkgconfig}/libmedia.pc" || die
sed -i -e "s#/opt#${EPREFIX}/${mybinprefix}#" \
etc/udev/rules.d/*.rules 1/doc/*.service sundtek.initd || die
- ! test -r etc/udev/rules.d/80-mediasrv-eeti.rules ||
- sed -i -e "s/^\([^#]\)/#\1/" etc/udev/rules.d/80-mediasrv-eeti.rules \
- || die
- rm etc/systemd/system/multi-user.target.wants/sundtek.service || die
- rmdir etc/systemd/system/multi-user.target.wants || die
- rmdir etc/systemd/system || die
- rmdir etc/systemd || die
+ sed -i -e "s/^\([^#]\)/#\1/" \
+ etc/udev/rules.d/80-mediasrv-eeti.rules || die
mv etc/udev/rules.d/80-mediasrv.rules etc/hal . || die
mv etc/udev "${myudev}" || die
mv 1/doc/hardware.conf 1/doc/sundtek.conf "${mylirc}" || die
@@ -117,7 +108,6 @@ src_prepare() {
mkdir "${S}/doc" && mkdir "${S}/doc/bin" || die
mv 1/doc/README 1/doc/*.conf "${S}/doc" || die
mv 1/doc/*.cgi "${S}/doc/bin" || die
- rm etc/ld.so.conf.d/optlib.conf && rmdir etc/ld.so.conf.d || die
rmdir 1/doc || die "${S}/1/doc contains files not known to the ebuild"
rmdir 1 || die "${S}/1 contains files not known to the ebuild"
my_movlibdir "${mylibdir}"
@@ -126,9 +116,7 @@ src_prepare() {
>etc/revdep-rebuild/50-sundtek-tv
if use ld-preload-file
then echo "/${mylibdir}/libmediaclient.so" >etc/ld.so.preload
- else sed -i -e 's/preload:-NO/preload:-YES/' sundtek.initd
fi
- sed -i -e "s'preload_lib:-/usr/lib'preload_lib:-/${mylibdir}'" sundtek.initd
if use ld-preload-env
then mkdir etc/env.d
echo "LD_PRELOAD=\"/${mylibdir}/libmediaclient.so\"" >etc/env.d/50sundtek-tv
@@ -151,7 +139,7 @@ want to use with sundtek-tv.
"
ln -sfn mediaclient.video mediaclient.audio
ln -sfn mediaclient.video mediaclient.dvb
- default
+ epatch_user
}
src_install() {
@@ -194,9 +182,7 @@ pkg_postinst() {
if ! use ld-preload-file
then if use ld-preload-env
then elog "You might have to call env-update and source /etc/profile"
- else elog "You need to set LD_PRELOAD locally, see"
- elog "${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+ else elog "You need to set LD_PRELOAD locally, see /usr/share/doc/${PF}/README.gentoo*"
fi
fi
- readme.gentoo_print_elog
}
diff --git a/media-tv/w_scan/Manifest b/media-tv/w_scan/Manifest
deleted file mode 100644
index 7b4ea41b..00000000
--- a/media-tv/w_scan/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST w_scan-20170107.tar.bz2 245517 SHA512 c8e163b5e4897e2bc48596a1104974c79807432c423a3dd172e85c6ed6d4f9a4a471150ae7fe1b78fe570987e9fdee666a491700368c8499b03e9b13aa5cde6a
diff --git a/media-tv/w_scan/files/plp_id.patch b/media-tv/w_scan/files/plp_id.patch
deleted file mode 100644
index 3f6f9ec5..00000000
--- a/media-tv/w_scan/files/plp_id.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Martin Väth <martin@mvath.de>:
-It seems that for DVB-T2 the plp_id always has to be 0.
-At least, this value seems to be correct for a Sundtek TV card in Rostock.
---- 1/descriptors.c
-+++ 1/descriptors.c
-@@ -1013,7 +1013,7 @@
- // descriptor_tag 8 uimsbf
- descriptor_length = buf[1]; // descriptor_length 8 uimsbf
- //descriptor_tag_extension = buf[2]; // descriptor_tag_extension 8 uimsbf
-- t->plp_id = buf[3]; // plp_id 8 uimsbf; uniquely identifies the PLP carrying this TS within the T2 system.
-+ t->plp_id = 0;//buf[3]; // plp_id 8 uimsbf; uniquely identifies the PLP carrying this TS within the T2 system.
- t->system_id = get_u16(buf + 4); // T2_system_id 16 uimsbf; uniquely identifies the T2 system within the network, two T2 systems with same T2_system_id && network_id ire identical, except that cell_id may differ..
- if ((t->extended_info = (descriptor_length > 4))) { // has extension
- switch (buf[6] >> 6) { // SISO/MISO 2 bslbf (Multiple-Input Single-Output)
diff --git a/media-tv/w_scan/w_scan-20170107-r1.ebuild b/media-tv/w_scan/w_scan-20170107-r1.ebuild
deleted file mode 100644
index 320086ef..00000000
--- a/media-tv/w_scan/w_scan-20170107-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-DESCRIPTION="Scan for DVB-C/DVB-T/DVB-S channels without prior knowledge of frequencies"
-HOMEPAGE="http://wirbel.htpc-forum.de/w_scan/index2.html"
-SRC_URI="http://wirbel.htpc-forum.de/w_scan/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +plp-id-zero"
-
-DEPEND=">=virtual/linuxtv-dvb-headers-5.8"
-RDEPEND=""
-
-src_prepare() {
- use plp-id-zero && eapply "${FILESDIR}"/plp_id.patch
- default
-}
-
-src_install() {
- emake DESTDIR="${ED}" install
-
- dodoc ChangeLog README
-
- if use doc; then
- dodoc doc/README.file_formats doc/README_VLC_DVB
- fi
-
- if use examples; then
- docinto examples
- dodoc doc/rotor.conf
- fi
-}
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
deleted file mode 100644
index 8effcd52..00000000
--- a/media-video/avidemux/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST avidemux-2.7.8.tar.gz 22080267 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
-DIST avidemux-i18n-2.7.8.tar.gz 2488165 SHA512 a62b06a3d95577cf805be36f991ccb63d044b7c3633ada65bd5810f0e7d8eb41aa874ef5dd63de4fcacc0be073935bed827b2f0bceba77ab735ac8673c1ad39f
diff --git a/media-video/avidemux/avidemux-2.7.8.ebuild b/media-video/avidemux/avidemux-2.7.8.ebuild
deleted file mode 100644
index 69ed6f3a..00000000
--- a/media-video/avidemux/avidemux-2.7.8.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake desktop flag-o-matic qmake-utils xdg
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/mean00/avidemux2_i18n/archive/${PV}.tar.gz -> ${PN}-i18n-${PV}.tar.gz"
-
-# Multiple licenses because of all the bundled stuff.
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
-SLOT="2.7"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
-
-BDEPEND="dev-lang/yasm
- qt5? ( dev-qt/linguist-tools:5 )"
-DEPEND="
- ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
- nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
- opengl? ( virtual/opengl:0 )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- )
- vaapi? ( x11-libs/libva:0= )
-"
-RDEPEND="${DEPEND}
- nls? ( virtual/libintl:0 )
- !<media-video/avidemux-${PV}
-"
-PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
-
-S="${WORKDIR}/avidemux2-${PV}"
-
-src_unpack() {
- default
- mv -f -T avidemux2_i18n-${PV} "${S}"/avidemux/qt4/i18n >/dev/null || die
-}
-
-src_prepare() {
- processes="buildCli:avidemux/cli"
- use qt5 && processes+=" buildQt4:avidemux/qt4"
-
- for process in ${processes} ; do
- CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
- done
-
- if use qt5; then
- # Fix icon name -> avidemux-2.7
- sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/${PN}.desktop || \
- die "Icon name fix failed."
-
- # The desktop file is broken. It uses avidemux3_portable instead of avidemux3_qt5
- sed -i -re '/^Exec/ s:(avidemux3_)portable:\1qt5:' appImage/${PN}.desktop || \
- die "Desktop file fix failed."
-
- # QA warnings: missing trailing ';' and 'Application' is deprecated.
- sed -i -e 's/Application;AudioVideo/AudioVideo;/g' appImage/${PN}.desktop || \
- die "Desktop file fix failed."
-
- # Now rename the desktop file to not collide with 2.6.
- mv appImage/${PN}.desktop ${PN}-${SLOT}.desktop || die "Collision rename failed."
- fi
-
- # Remove "Build Option" dialog because it doesn't reflect
- # what the GUI can or has been built with. (Bug #463628)
- sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || \
- die "Couldn't remove \"Build Option\" dialog."
-
- # Fix underlinking with gold
- sed -i -e 's/{QT_QTGUI_LIBRARY}/{QT_QTGUI_LIBRARY} -lXext/' \
- avidemux/common/ADM_render/CMakeLists.txt || die
-}
-
-src_configure() {
- # See bug 432322.
- use x86 && replace-flags -O0 -O1
-
- # The build relies on an avidemux-core header that uses 'nullptr'
- # which is from >=C++11. Let's use the GCC-6 default C++ dialect.
- append-cxxflags -std=c++14
-
- local mycmakeargs=(
- -DGETTEXT="$(usex nls)"
- -DSDL="$(usex sdl)"
- -DLibVA="$(usex vaapi)"
- -DOPENGL="$(usex opengl)"
- -DVDPAU="$(usex vdpau)"
- -DXVIDEO="$(usex xv)"
- )
-
- use qt5 && mycmakeargs+=(
- -DENABLE_QT5="$(usex qt5)"
- -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
- )
-
- use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
- done
-}
-
-src_compile() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_compile
- done
-}
-
-src_test() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_test
- done
-}
-
-src_install() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_install
- done
-
- if use qt5; then
- cd "${S}" || die "Can't enter source folder"
- newicon ${PN}_icon.png ${PN}-${SLOT}.png
- domenu ${PN}-${SLOT}.desktop
- fi
-}
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
deleted file mode 100644
index ad0bd2cc..00000000
--- a/media-video/avidemux/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>media-video@gentoo.org</email>
- <name>Gentoo Video project</name>
- </maintainer>
- <use>
- <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">avidemux</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-video/avinfo/Manifest b/media-video/avinfo/Manifest
deleted file mode 100644
index ddf74c0d..00000000
--- a/media-video/avinfo/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST avinfo-1.0.a15unix-patch1.tar.gz 5665 SHA512 9219d7b4a92cc776979b9332cfb286781e4cfada5280bb145377a4d51078895368392fef7c4ff24dc714101617f4aaa0916fd5c19897919af0dfa78f3765a457
-DIST avinfo-1.0.a15unix.tar.gz 105743 SHA512 984bb2e8916c1469206163ef9fa37f89d71a842a94a1ebf5a92ded410de4aacaf83d77d790f70624431d5c60305951a3cfbdea075fc2705bbd28250f9f9ade2e
diff --git a/media-video/avinfo/avinfo-1.0_alpha15_p1-r1.ebuild b/media-video/avinfo/avinfo-1.0_alpha15_p1-r1.ebuild
deleted file mode 100644
index 54a83441..00000000
--- a/media-video/avinfo/avinfo-1.0_alpha15_p1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-inherit toolchain-funcs
-
-MY_P=${PN}-1.0.a15unix
-
-DESCRIPTION="Utility for displaying AVI information"
-HOMEPAGE="http://shounen.ru/soft/avinfo/english.shtml"
-SRC_URI="http://shounen.ru/soft/${PN}/${MY_P}.tar.gz
- http://shounen.ru/soft/${PN}/${MY_P}-patch1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${PN}-1.0.a15
-
-src_prepare() {
- eapply "${WORKDIR}"/${MY_P}-patch1/${MY_P}-patch1.diff
- eapply "${FILESDIR}"/no-bison.patch
- eapply "${FILESDIR}"/no-common.patch
- sed -i -e 's/$(CC) $(OBJ)/$(CC) $(LDFLAGS) $(OBJ)/' src/Makefile || die
- default
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- dobin src/avinfo
- doman src/avinfo.1
- dodoc CHANGELOG README "${WORKDIR}"/${MY_P}-patch1/FIXES
- dodoc doc/*
-}
diff --git a/media-video/avinfo/files/no-bison.patch b/media-video/avinfo/files/no-bison.patch
deleted file mode 100644
index 8a1d7926..00000000
--- a/media-video/avinfo/files/no-bison.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 1/config.mk
-+++ 2/config.mk
-@@ -8,8 +8,8 @@
-
- CC=gcc
- CFLAGS=-O2 -Wall
--BISON=bison
--#BISON=NONE
-+#BISON=bison
-+BISON=NONE
-
- # --------------------- Installation options ----------------------
-
diff --git a/media-video/avinfo/files/no-common.patch b/media-video/avinfo/files/no-common.patch
deleted file mode 100644
index 32ac9a99..00000000
--- a/media-video/avinfo/files/no-common.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 1/src/avinfo.h
-+++ 1/src/avinfo.h
-@@ -35,11 +35,11 @@
- V_aspectX,
- V_aspectY,
- V_exist
--}video_enum;
-+};
-
- #define VIDEO_INFO_SIZE (V_exist+1)
-
--enum{
-+enum audio_enum{
- A_l,
- A_bits,
- A_cc,
-@@ -48,7 +48,7 @@
- A_ch,
- A_freq,
- A_exist
--}audio_enum;
-+};
-
-
- #define AUDIO_INFO_SIZE (A_exist+1)
diff --git a/media-video/avinfo/metadata.xml b/media-video/avinfo/metadata.xml
deleted file mode 100644
index b919c846..00000000
--- a/media-video/avinfo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
-</pkgmetadata>
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
deleted file mode 100644
index abb9a1f6..00000000
--- a/media-video/handbrake/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c
diff --git a/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch b/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch
deleted file mode 100644
index 551a64ee..00000000
--- a/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/configure b/configure
-index 5c870e1d7..2f5834083 100755
---- a/configure
-+++ b/configure
-@@ -14,20 +14,8 @@ inpath()
- }
-
- if ( inpath bash ); then
-- pp=""
-- for p in python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python2 python2.7 python
-- do
-- if ( inpath $p ); then
-- pp="$p"
-- break
-- fi
-- done
-- if [ pp != "" ]; then
-- exec $pp `dirname $0`/make/configure.py "$@"
-- exit 0
-- else
-- echo "ERROR: no suitable version of python found."
-- fi
-+ exec python `dirname $0`/make/configure.py "$@"
-+ exit 0
- else
- echo "ERROR: bash shell not found."
- fi
diff --git a/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch b/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
deleted file mode 100644
index 6a146457..00000000
--- a/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/test/module.defs 2020-06-13 15:05:35.000000000 +0100
-+++ a/test/module.defs 2020-07-03 11:15:53.951205608 +0100
-@@ -30,6 +30,10 @@
- endif
- endif
-
-+ifeq (1,$(FEATURE.x265))
-+ TEST.GCC.l += x265
-+endif
-+
- ifeq (1,$(FEATURE.flatpak))
- TEST.GCC.l += glib-2.0
- endif
diff --git a/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch b/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch
deleted file mode 100644
index 7dc1f693..00000000
--- a/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/libhb/dvdnav.c
-+++ b/libhb/dvdnav.c
-@@ -1225,16 +1225,7 @@
- {
- for (kk = 0; kk < buttons; kk++)
- {
-- dvdnav_t *dvdnav_copy;
--
-- result = dvdnav_dup( &dvdnav_copy, d->dvdnav );
-- if (result != DVDNAV_STATUS_OK)
-- {
-- hb_log("dvdnav dup failed: %s", dvdnav_err_to_string(d->dvdnav));
-- goto done;
-- }
-- title = try_button( dvdnav_copy, kk, list_title );
-- dvdnav_free_dup( dvdnav_copy );
-+ title = try_button( d->dvdnav, kk, list_title );
-
- if ( title >= 0 )
- {
diff --git a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
deleted file mode 100644
index 7e8ab997..00000000
--- a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/libhb/common.c
-+++ b/libhb/common.c
-@@ -243,7 +243,6 @@
- {
- // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
- { { "", "dts", NULL, HB_ACODEC_DCA_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS, },
-- { { "AAC (faac)", "faac", NULL, 0, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, },
- { { "AAC (ffmpeg)", "ffaac", NULL, HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, },
- { { "AC3 (ffmpeg)", "ffac3", NULL, HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3, },
- { { "MP3 (lame)", "lame", NULL, HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3, },
---- a/scripts/manicure.rb
-+++ b/scripts/manicure.rb
-@@ -349,7 +349,7 @@
- audioEncoders << "copy:dtshd"
- when /AAC Pass/
- audioEncoders << "copy:aac"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoders << "av_aac"
- when "AAC (FDK)"
- audioEncoders << "fdk_aac"
-@@ -466,7 +466,7 @@
- case hash["AudioEncoderFallback"]
- when /AC3/
- audioEncoderFallback << "ac3"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
- when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
-@@ -753,7 +753,7 @@
- audioEncoders << "copy:dtshd"
- when /AAC Pass/
- audioEncoders << "copy:aac"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoders << "av_aac"
- when "AAC (FDK)"
- audioEncoders << "fdk_aac"
-@@ -870,7 +870,7 @@
- case hash["AudioEncoderFallback"]
- when /AC3/
- audioEncoderFallback << "ac3"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
- when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
-@@ -1163,7 +1163,7 @@
- audioEncoders << "copy:dtshd"
- when /AAC Pass/
- audioEncoders << "copy:aac"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoders << "av_aac"
- when "AAC (FDK)"
- audioEncoders << "fdk_aac"
-@@ -1298,7 +1298,7 @@
- case hash["AudioEncoderFallback"]
- when /AC3/
- audioEncoderFallback << "ac3"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
- when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
-@@ -1615,7 +1615,7 @@
- audioEncoders << "copy:dtshd"
- when /AAC Pass/
- audioEncoders << "copy:aac"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoders << "av_aac"
- when "AAC (FDK)"
- audioEncoders << "fdk_aac"
-@@ -1732,7 +1732,7 @@
- case hash["AudioEncoderFallback"]
- when /AC3/
- audioEncoderFallback << "ac3"
-- when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
-+ when "AAC (ffmpeg)", "AAC (avcodec)"
- audioEncoderFallback << "av_aac"
- when "AAC (FDK)"
- audioEncoderFallback << "fdk_aac"
diff --git a/media-video/handbrake/handbrake-1.3.3-r1.ebuild b/media-video/handbrake/handbrake-1.3.3-r1.ebuild
deleted file mode 100644
index a9b5fdb4..00000000
--- a/media-video/handbrake/handbrake-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
- inherit git-r3
-else
- MY_P="HandBrake-${PV}"
- SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2"
- S="${WORKDIR}/${MY_P}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
- app-arch/xz-utils
- media-libs/speex
- dev-libs/jansson
- dev-libs/libxml2
- media-libs/a52dec
- media-libs/libass:=
- >=media-libs/libbluray-1.0
- >=media-libs/dav1d-0.5.1
- media-libs/libdvdnav
- media-libs/libdvdread:=
- media-libs/libsamplerate
- media-libs/libtheora
- media-libs/libvorbis
- >=media-libs/libvpx-1.8
- nvenc? ( media-libs/nv-codec-headers )
- media-libs/opus
- media-libs/x264:=
- media-sound/lame
- sys-libs/zlib
- >=media-video/ffmpeg-4.2.1:0=[postproc,fdk?]
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-ugly:1.0
- media-plugins/gst-plugins-a52dec:1.0
- media-plugins/gst-plugins-libav:1.0
- media-plugins/gst-plugins-x264:1.0
- media-plugins/gst-plugins-gdkpixbuf:1.0
- )
- gtk? (
- >=x11-libs/gtk+-3.10
- dev-libs/dbus-glib
- dev-libs/glib:2
- dev-libs/libgudev:=
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/libnotify
- x11-libs/pango
- )
- fdk? ( media-libs/fdk-aac )
- x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] )
- "
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-lang/nasm
- dev-util/cmake
- dev-util/intltool
- dev-util/meson
- sys-devel/automake"
-
-PATCHES=(
- # Remove libdvdnav duplication and call it on the original instead.
- # It may work this way; if not, we should try to mimic the duplication.
- "${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch"
-
- # Remove faac dependency; TODO: figure out if we need to do this at all.
- "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch"
-
- # Use whichever python is set by portage
- "${FILESDIR}/${PN}-1.3.0-dont-search-for-python.patch"
-
- # Fix x265 linkage... again again #730034
- "${FILESDIR}/${PN}-1.3.3-x265-link.patch"
-)
-
-src_prepare() {
- # Get rid of leftover bundled library build definitions,
- sed -i 's:.*\(/contrib\|contrib/\).*::g' \
- "${S}"/make/include/main.defs \
- || die "Contrib removal failed."
-
- default
-
- cd "${S}/gtk"
- # Don't run autogen.sh.
- sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
- eautoreconf
-}
-
-src_configure() {
- # Libav was replaced in 1.2 with ffmpeg by default
- # but I've elected to not make people change their use flags for AAC
- # as its the same code anyway
- ./configure \
- --force \
- --verbose \
- --prefix="${EPREFIX}/usr" \
- --disable-gtk-update-checks \
- --disable-flatpak \
- --disable-gtk4 \
- $(use_enable libav-aac ffmpeg-aac) \
- $(use_enable fdk fdk-aac) \
- $(usex !gtk --disable-gtk) \
- $(usex !gstreamer --disable-gst) \
- $(use_enable numa) \
- $(use_enable nvenc) \
- $(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
- emake -C build
-
- # TODO: Documentation building is currently broken, try to fix it.
- #
- # if use doc ; then
- # emake -C build doc
- # fi
-}
-
-src_install() {
- emake -C build DESTDIR="${D}" install
-
- dodoc README.markdown AUTHORS.markdown NEWS.markdown THANKS.markdown
-}
-
-pkg_postinst() {
- einfo "Gentoo builds of HandBrake are NOT SUPPORTED by upstream as they"
- einfo "do not use the bundled (and often patched) upstream libraries."
- einfo ""
- einfo "Please do not raise bugs with upstream because of these ebuilds,"
- einfo "report bugs to Gentoo's bugzilla or Multimedia forum instead."
-
- einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
- if use gtk ; then
- einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
- fi
-
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
deleted file mode 100644
index 83b12add..00000000
--- a/media-video/handbrake/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>thev00d00@gentoo.org</email>
- <name>Ian Whyman</name>
- </maintainer>
- <use>
- <flag name="gstreamer">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag>
- <flag name="gtk">Install the GTK UI, ghb.</flag>
- <flag name="fdk">Support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
- <flag name="libav-aac">Support for encoding AAC using libav's internal encoder.</flag>
- <flag name="numa">Adds support for x265's NUMA capabilities.</flag>
- <flag name="nvenc">Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.</flag>
- <flag name="x265">Support for encoding h265 using <pkg>media-libs/x265</pkg>.</flag>
- </use>
-</pkgmetadata>
diff --git a/media-video/video-mv/ChangeLog b/media-video/video-mv/ChangeLog
new file mode 100644
index 00000000..daf68ef3
--- /dev/null
+++ b/media-video/video-mv/ChangeLog
@@ -0,0 +1,266 @@
+# ChangeLog for media-video/video-mv
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*video-mv-8.6 (20 Sep 2015)
+
+ 20 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-8.5 (12 Sep 2015)
+
+ 12 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-8.4 (05 Sep 2015)
+
+ 05 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-8.3 (30 Aug 2015)
+
+ 30 Aug 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-8.2 (12 Jul 2015)
+
+ 12 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-8.1 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-8.0 (16 Mar 2015)
+
+ 16 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump: Support mpv instead of mplayer2
+
+*video-mv-7.17-r1 (15 Mar 2015)
+
+ 15 Mar 2014; Martin Väth <martin@mvath.de>:
+ Remove *mplayer2, since its support is deprecated in gentoo
+
+*video-mv-7.17 (18 Aug 2014)
+
+ 18 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-7.16 (31 May 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 31 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-7.15 (30 Mar 2014)
+
+ 30 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-7.14 (26 Mar 2014)
+
+ 26 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support adevice, immediatemode, audiorate
+
+*video-mv-7.13-r1 (17 Dec 2013)
+
+ 15 Mar 2014; Martin Väth <martin@mvath.de>:
+ Use optfeature
+
+ 24 Jan 2014; Martin Väth <martin@mvath.de>:
+ Avoid duplicate installation
+
+*video-mv-7.13-r1 (17 Dec 2013)
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ _videoscript.sh -> /usr/share/video-mv: not meant to be called by the user
+ Fix sh path
+
+*video-mv-7.13 (09 Dec 2013)
+
+ 09 Dec 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-7.12 (24 Nov 2013)
+
+ 24 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-7.11 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-7.10-r1 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Shebang care
+
+*video-mv-7.10 (20 Oct 2013)
+
+ 20 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-7.9 (18 Aug 2013)
+
+ 12 Oct 2013; Martin Väth <martin@mvath.de>:
+ Use readme.gentoo.eclass
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 18 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-7.8 (11 Jul 2013)
+
+ 11 Jul 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-7.7 (09 Jul 2013)
+
+ 09 Jul 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-7.5 (17 Jun 2013)
+
+ 17 Jun 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-7.4 (16 Jun 2013)
+
+ 16 Jun 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-7.3 (12 Jun 2013)
+
+ 12 Jun 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-7.2 (11 Jun 2013)
+
+ 11 Jun 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-7.1 (10 Jun 2013)
+
+ 10 Jun 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-6.1 (09 Jun 2013)
+
+ 09 Jun 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+ 10 Jun 2013; Martin Väth <martin@mvath.de>:
+ Make runtitle mandatory for USE=zsh-completion, recommend otherwise
+
+*video-mv-5.19 (04 Jun 2013)
+
+ 04 Jun 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-5.18 (02 Jun 2013)
+
+ 02 Jun 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-5.17 (01 Jun 2013)
+
+ 01 Jun 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-5.15 (27 May 2013)
+
+ 27 May 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Remove misleading USE=libav
+
+*video-mv-5.14 (28 Jan 2013)
+
+ 28 Jan 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-5.13 (18 Nov 2012)
+
+ 18 Nov 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-5.12 (17 Nov 2012)
+
+ 17 Nov 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support for zsh completion
+
+*video-mv-5.11 (04 Oct 2012)
+
+ 04 Oct 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-5.10 (06 Sep 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 06 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-5.9 (04 Sep 2012)
+
+ 04 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-5.8 (14 Jul 2012)
+
+ 14 Jul 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-5.7 (14 Jun 2012)
+
+ 14 Jun 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-5.6 (20 May 2012)
+
+ 20 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Very experimental support for libav
+
+*video-mv-5.5 (07 May 2012)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-5.4 (04 May 2012)
+
+ 04 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-5.3 (08 Apr 2012)
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 08 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-5.2 (28 Feb 2012)
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*video-mv-5.1-r1 (13 Feb 2012)
+
+ 13 Feb 2012; Martin Väth <martin@mvath.de>:
+ Install also README
+
+*video-mv-5.1 (12 Feb 2012)
+
+ 12 Feb 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/media-video/video-mv/Manifest b/media-video/video-mv/Manifest
index ce570a5c..b4727af9 100644
--- a/media-video/video-mv/Manifest
+++ b/media-video/video-mv/Manifest
@@ -1 +1 @@
-DIST video-mv-17.1.tar.gz 21687 SHA512 7c6d71bcf4807f9a60378b21c85e220e7389ad59c7023f029c7b628063597b7da979299766ec4a591af4cddf9383277628b9c41abaaf8aa801cdc98c763a90d9
+DIST video-mv-8.6.tar.gz 17738 SHA256 0b171761cbf7b7ee8bd44aaecca1c51d72e1b0bd45cfa47a8f20aaa0d6d4b07d SHA512 57f376401b2019d18b86c86a70a717fed90ba1d22047c34b04c27dc523cb0f6856fe16d8993899fadfe81dd9b945fd62397f81830719917f439cc4553b6ec885 WHIRLPOOL bd0153a0ed47dec2853e80303d9bcc27e8b13ba957a029cd7d7de15ed595198a3889956b568625c36568766f3d1d51e08031fd0e4e717f39bbb7451f0ba6c8cd
diff --git a/media-video/video-mv/metadata.xml b/media-video/video-mv/metadata.xml
index ab10fb7d..e85a5d21 100644
--- a/media-video/video-mv/metadata.xml
+++ b/media-video/video-mv/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/media-video/video-mv/video-mv-17.1.ebuild b/media-video/video-mv/video-mv-8.6.ebuild
index 4c792f49..21383ea3 100644
--- a/media-video/video-mv/video-mv-17.1.ebuild
+++ b/media-video/video-mv/video-mv-8.6.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2012-2021 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
-inherit readme.gentoo-r1
+inherit eutils readme.gentoo
DESCRIPTION="Frontends for using mplayer/mencoder, ffmpeg/libav, or tzap as video recorder"
HOMEPAGE="https://github.com/vaeth/video-mv/"
@@ -11,20 +12,20 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-
-# This should really depend on a USE-flag but must not by policy.
-# Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283
-OPTIONAL_RDEPEND=">=app-shells/runtitle-2.3"
-
-RDEPEND=">=app-shells/push-2.0-r2
+RDEPEND="app-shells/push
+ >=app-shells/runtitle-2.3
|| ( ( media-sound/alsa-utils
|| ( media-video/mplayer[encode] virtual/ffmpeg ) )
- media-tv/linuxtv-dvb-apps )
- ${OPTIONAL_RDEPEND}"
+ media-tv/linuxtv-dvb-apps )"
DEPEND=""
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="If you use dvb-t with zsh completion, you might want to put
+zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}'
+into your ~/.zshrc or /etc/zshrc for case-insensitive matching."
+
src_prepare() {
local i
use prefix || for i in bin/*
@@ -33,11 +34,11 @@ src_prepare() {
-e 's"^\. _videoscript\.sh$". '"${EPREFIX}/usr/share/video-mv/_videoscript.sh"'"' \
-- "${i}" || die
done
- default
+ epatch_user
}
src_install() {
- local i DISABLE_AUTOFORMATTING DOC_CONTENTS
+ local i
insinto /usr/bin
for i in bin/*
do if test -h "${i}"
@@ -52,14 +53,11 @@ src_install() {
doins etc/*
insinto /usr/share/zsh/site-functions
doins zsh/*
- dodoc README.md
- DISABLE_AUTOFORMATTING="true"
- DOC_CONTENTS="If you use dvb-t with zsh completion, you might want to put
-zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}'
-into your ~/.zshrc or /etc/zshrc for case-insensitive matching."
+ dodoc README
readme.gentoo_create_doc
}
pkg_postinst() {
- readme.gentoo_print_elog
+ optfeature "status bar support" app-shells/runtitle
+ readme.gentoo_pkg_postinst
}
diff --git a/metadata/layout.conf b/metadata/layout.conf
index fd2d3342..46c88c9e 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -1,7 +1,3 @@
cache-formats = md5-dict
-manifest-hashes = SHA512
-masters = gentoo
-repo-name = mv
thin-manifests = true
-update-changelog = true
-use-manifests = strict
+masters = gentoo
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
deleted file mode 100644
index 341af384..00000000
--- a/metadata/pkg_desc_index
+++ /dev/null
@@ -1,139 +0,0 @@
-app-admin/flexlm 9.5-r2: Macrovision FLEXlm license manager and utils
-app-admin/sudox 10.0: wrapper for sudo which can pass X authority data and deal with screen and tmux
-app-arch/archwrap 11.4: A collection of POSIX shell scripts to invoke archiver programs
-app-arch/bzwc 5.1: A POSIX shell wrapper for wc, supporting compressed files (xz, lzma, bz2, gz)
-app-arch/paq8l 20070308: Open source file compressor and archiver
-app-cdr/cdrtools 99999999: A set of tools for CD/DVD reading and recording, including cdrecord
-app-dicts/ispell-de 20161207: German and Swiss dictionaries for ispell
-app-dicts/ispell-de-alt 2-r1: German dictionary (traditional orthography) for ispell
-app-dicts/stardict-dictd-BritannicaConcise 2.4.2: Stardict Dictionary for Dictd.org's The Britannica Concise Encyclopedia
-app-dicts/stardict-dictd-cced 2.4.2: Stardict Dictionary for Dictd.org's Collins Cobuild English Dictionary
-app-dicts/stardict-dictd-longman 2.4.2: Stardict Dictionary for Dictd.org's Longman Dictionary of Contemporary English
-app-dicts/stardict-dictd-merrianwebster 2.4.2: Stardict Dictionary for Dictd.org's Merrian Webster 10th dictionary
-app-dicts/stardict-dictd-oald 2.4.2: Stardict Dictionary for Dictd.org's Oxford Advanced Learner's Dictionary
-app-dicts/stardict-dictd-thesaurus-ee 2.4.2: Stardict Dictionary for Dictd.org's English Thesaurus
-app-dicts/stardict-freedict-deu-eng 2.4.2: Stardict Dictionary German to English
-app-dicts/stardict-freedict-deu-ita 2.4.2: Stardict Dictionary German to Italian
-app-dicts/stardict-freedict-ita-deu 2.4.2: Stardict Dictionary Italian to German
-app-dicts/steak 1.7.3-r3: EN => DE Dictionary
-app-emacs/mv_emacs 1.4-r1: (X)Emacs extensions: block support, macrorecorder, verify change
-app-eselect/eselect-net 0.2-r1: eselect module for managing network open-rc service configurations
-app-misc/knapsack 7.3: A fast solver for the 0/1-knapsack problem with multiple knapsacks
-app-misc/machine-learning-mv 1.3: Some machine learning experiments
-app-mobilephone/adb-sync 0_p20190101: Synchronize files between a PC and an Android device using ADB
-app-portage/changelog-gitrepo 1.1: Create ChangeLog data for gentoo repositories from git
-app-portage/eix 0.35.2 99999999: Search and query ebuilds
-app-portage/etcat 1.0.2 99999999: Updated version of an old Portage information extractor
-app-portage/find_cruft 5.2: find cruft files not managed by portage
-app-portage/getdelta 0.7.9-r2: dynamic deltup client
-app-portage/logclean 18.4.1: Keep only (compressed) logs of installed packages and cleanup emerge.log
-app-portage/portage-bashrc-mv 20.3: Provide support for /etc/portage/bashrc.d and /etc/portage/package.cflags
-app-portage/portage-postsyncd-mv 8.4: postsync hooks for portage to sync from git
-app-portage/trickyfetch 10.1: Plugin for FETCHCOMMAND to help organize and cleanup your DISTDIR
-app-portage/useflags 4.2: Print or save the current USE-flag state and compare with older versions
-app-portage/world-mv 3.20: Organize your world file and find installed packages or differences to @world
-app-shells/auto-fu-zsh 0.0.1.12-r4 0.0.1.12_p0 99999999: zsh automatic complete-word and list-choices: incremental completion
-app-shells/dash 99999999: Descendant of the NetBSD ash. POSIX compliant except for multibyte characters
-app-shells/fast-syntax-highlighting 1.5.5 99999999: Optimized and extended zsh-syntax-highlighting
-app-shells/oh-my-zsh 99999999: A ready-to-use zsh configuration with plugins
-app-shells/push 3.4: A POSIX shell function to treat a variable like an array, quoting args
-app-shells/quoter 4.2: Quote arguments or standard input for usage in POSIX shell by eval
-app-shells/runtitle 2.11: Scripts to run commands and set the hard status line (windows title)
-app-shells/schily-tools 2021.04.21: Many tools from Joerg Schilling, including a POSIX compliant Bourne Shell
-app-shells/set_prompt 3.2: An intelligent prompt for zsh or bash with status line (window title) support
-app-shells/termcolors-mv 4.8: 256colors sample script and dircolors configuration for standard or 256 colors
-app-shells/zsh-autosuggestions 0.6.4 99999999: Fish-like autosuggestions for zsh
-app-shells/zsh-syntax-highlighting 0.8.0_alpha1 99999999: Fish shell like syntax highlighting for zsh
-app-shells/zshrc-mv 6.6: A zshrc file initializing zsh specific interactive features
-app-text/ispell 3.4.00-r1: fast screen-oriented spelling checker
-app-text/lesspipe 1.85 99999999: Wolfgang Friebel's preprocessor for sys-apps/less. Disable by appending colon
-app-text/mbtpdfasm 1.0.28-r1: Tool to assemble/merge, extract information from, and update the metadata in PDF
-app-text/psjoin 0.3: concatenate postscript files. From new PostScript Utilities
-app-text/stardict 3.0.6-r4 4.0.0_pre20170304: A international dictionary supporting fuzzy and glob style matching
-dev-cpp/cpplint 99999999: The google styleguide together with cpplint and an emacs file
-dev-libs/osformat 1.0.7 999999999: C++ library for a typesafe printf/sprintf based on << conversion
-dev-libs/weston 5.0.0-r1 8.0.0: Wayland reference compositor
-dev-perl/File-lchown 0.20-r1: Use the lchown(2) and lutimes(2) system call from Perl
-dev-python/PyPDF2 1.26.0: Python library to work with pdf files
-dev-tex/chklref 2.6.0 2.6.1_alpha20170913: Finds useless references in latex files or unnecessarily numbered environments
-dev-util/comp 4.3.1: compare files or directories, including metadata
-dev-util/diffhelp 1.12: A frontend, beautifier, and path-fixer for diff -u
-dev-util/mv_perl 4.2: A collection of perl scripts (replacement in files, syncing dirs etc)
-dev-util/pyrep 1.5-r1: Search and/or replace regular expressions within many files interactively
-dev-util/replacer 3.3: Search and replace python regular expressions within many files interactively
-dev-vcs/git-wrappers-mv 2.2: Some personal wrappers for the most important git commands
-games-action/trackballs 1.1.4-r1: simple game similar to the classical game Marble Madness
-games-board/chessproblem 1.10 2.13: Find solutions of chess problems (mate, selfmate, and helpmate) with cooks
-games-emulation/sdlmame 0.174-r2: Multiple Arcade Machine Emulator + Multi Emulator Super System (MESS)
-games-emulation/xmame 0.106-r4: Multiple Arcade Machine Emulator for X11
-games-emulation/xmess 0.106-r3: Multiple Arcade Machine Emulator for X11
-games-engines/freesci 0.6.4-r2: Sierra script interpreter for your old Sierra adventures
-games-rpg/aklabeth 1.0-r1: A remake of Richard C. Garriott's Ultima prequel
-games-rpg/dsa-stats 1.1: calculate stat probabalities for the role playing game DSA - Das schwarze Auge
-games-rpg/freedroidrpg 1.0_rc2: A modification of the classical Freedroid engine into an RPG
-games-rpg/m5figur-mv 4.2.2: LaTeX2e character sheet layout for the Midgard Role Playing Game (Edition M5)
-media-gfx/ipe 7.2.24: Drawing editor for creating figures in PDF or PS formats
-media-gfx/libspiro 20200505-r1: A spline computation library
-media-gfx/pqiv 2.11: powerful GTK based command-line image viewer with a minimal UI
-media-libs/avidemux-core 2.7.8: Core libraries for simple video cutting, filtering and encoding tasks
-media-libs/avidemux-plugins 2.7.8: Plugins for the video editor media-video/avidemux
-media-tv/nvtv 0.4.7-r3: TV-Out for NVidia cards
-media-tv/sundtek-tv 210407.172308: Sundtek MediaTV Pro III Drivers
-media-tv/w_scan 20170107-r1: Scan for DVB-C/DVB-T/DVB-S channels without prior knowledge of frequencies
-media-video/avidemux 2.7.8: Video editor designed for simple cutting, filtering and encoding tasks
-media-video/avinfo 1.0_alpha15_p1-r1: Utility for displaying AVI information
-media-video/handbrake 1.3.3-r1: Open-source, GPL-licensed, multiplatform, multithreaded video transcoder
-media-video/video-mv 17.1: Frontends for using mplayer/mencoder, ffmpeg/libav, or tzap as video recorder
-net-dialup/accounting 1.60.45.3.1-r1: Give statistics about dialup connections. Originally part of SuSE's smpppd
-net-dialup/martian-modem 20100123-r3: ltmodem alternative driver providing support for Agere Systems winmodems
-net-dns/host 20070128-r1: A powerful command-line DNS query and test tool
-net-dns/noip-updater 2.1.9-r5: no-ip.com dynamic DNS updater
-net-firewall/firewall-mv 13.2: Initialize iptables and net-related sysctl variables
-net-misc/netctl 1.11: Profile based network connection tool from Arch Linux
-net-misc/openrdate 1.2: use TCP or UDP to retrieve the current time of another machine
-net-misc/sshstart 4.10: Start ssh-agent/ssh-add only if you really use ssh or friends
-net-print/foo2zjs 20200221: Support for printing to ZjStream-based printers
-sci-geosciences/googleearth 7.1.8.3036-r3 7.3.0.3832-r3 7.3.2 7.3.3: A 3D interface to the planet
-sci-mathematics/genius 1.0.21: Genius Mathematics Tool and the GEL Language
-sci-mathematics/reduce 20141130-r3 20190413: A general-purpose computer algebra system
-sys-apps/cpi 3.2: A wrapper for cp -i -a, making use of diff
-sys-apps/less 590: Excellent text file viewer, optionally with additional selection feature
-sys-apps/man 1.6g-r3: Standard commands to read man pages
-sys-apps/openrc-wrapper 2.4: Use openrc init scripts with systemd or other init systems
-sys-apps/paxopen 1.2: A wrapper script to set PAX kernel variables to an insecure/safe state
-sys-apps/schedule 8.0.1: script to schedule jobs in a multiuser multitasking environment
-sys-apps/starter 3.0: POSIX shell script and function to schedule commands
-sys-block/parted 2.4-r3: Create, destroy, resize, check, copy partitions and file systems
-sys-block/zram-init 11.0: Scripts to support compressed swap devices or ramdisks with zram
-sys-boot/grub-cfg-mv 1.8: A grub.cfg library/example for GRUB2
-sys-fs/emount 3.0.5: mount/unmount create/remove dm-crypt filesystems according to your /etc/fstab
-sys-fs/squash_dir 13.14-r1: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist
-sys-fs/squashfs-tools 4.5_alpha20210318 99999999: Tool for creating compressed filesystem type squashfs
-sys-fs/squashfuse 0.1.104: FUSE filesystem to mount squashfs archives
-sys-fs/squashmount 22.1: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist
-sys-kernel/kccmp 0.3-r2: A simple tool for comparing two linux kernel .config files
-sys-kernel/kconfig-hardened-check 0.5.9 99999999: A script for checking the hardening options in the Linux kernel config
-sys-kernel/kernel 6.3: A POSIX shell script to compile the kernel with user permissions
-sys-power/cpupower 99999999: Shows and sets processor power related values
-virtual/cdrtools 1: Virtual for command-line recorders cdrtools and cdrkit
-virtual/freedesktop-icon-theme 0-r4: Virtual to choose between different icon themes
-virtual/man 0-r4: Virtual for man
-www-plugins/bookmark-dupes 6.4: Firefox webextension: remove duplicate bookmarks/empty folders/descriptions
-www-plugins/calc-extension 5.3: Firefox webextension: calculate values of mathematical expressions
-www-plugins/canvasblocker 0.5.5: Firefox webextension: block canvas API to prevent canvas fingerprinting
-www-plugins/dark-mode 0.3.7: Firefox webextension: a global dark theme for the web
-www-plugins/decentraleyes 2.0.8: Firefox webextension: avoid centralized services
-www-plugins/duckduckgo 2018.10.24: Firefox webextension: privacy essentials, including duckduckgo search engine
-www-plugins/epubreader 2.0.13: Firefox webextension: read ebook (.epub) files
-www-plugins/form-history-control 2.5.1.0: Firefox webextension: edit the saved history of forms
-www-plugins/google-translation 2.6: Firefox webextension: translate to your native language a selected text
-www-plugins/google-translator-for-firefox 3.0.3.3: Firefox webextension: translate text or page with google translator
-www-plugins/https-everywhere 2018.10.31: Firefox webextension: force https for all websites of a provided list
-www-plugins/no-color 0.9.4: Firefox webextension: remove colors and background images from the page
-www-plugins/noscript 11.0.36: Firefox webextension: restrict active contents like java/javascript/flash
-www-plugins/skip-redirect 2.2.1: Firefox webextension: skip intermediary pages before redirecting
-www-plugins/translate-to-me 1.1: Firefox webextension: translate the selected text with www.linguee.com
-www-plugins/ublock-origin 1.17.2: Firefox webextension: An efficient list-based blocker
-x11-libs/gtk+ 2.24.33 3.24.29: Gimp ToolKit +
-x11-libs/motif 2.3.8-r1: The Motif user interface component toolkit
-x11-themes/fvwm-crystal 3.6.5: Configurable FVWM theme with transparency and freedesktop compatible menu
diff --git a/net-dialup/accounting/ChangeLog b/net-dialup/accounting/ChangeLog
new file mode 100644
index 00000000..1bc27088
--- /dev/null
+++ b/net-dialup/accounting/ChangeLog
@@ -0,0 +1,26 @@
+# ChangeLog for net-dialup/accounting
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*accounting-1.60.45.3.1.ebuild
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 25 Jul 2010; Martin Väth <martin@mvath.de>:
+ Bump and remove old, since old version can no longer be downloaded.
+ Bump to EAPI="3", use tc-getCXX
+
+*accounting-1.59.38-r2.ebuild
+
+ 28 Mar 2010; Martin Väth <martin@mvath.de>:
+ import with minor changes from a personal overlay.
diff --git a/net-dialup/accounting/Manifest b/net-dialup/accounting/Manifest
index 689ec4fc..e92258e4 100644
--- a/net-dialup/accounting/Manifest
+++ b/net-dialup/accounting/Manifest
@@ -1 +1 @@
-DIST smpppd-1.60.45-3.1.src.rpm 175561 SHA512 7393891861de4dbb74f720f4db2f8a668081f643ec019a5764ae4ef03b2f088e89c566f1b6f5f2fea49b286830cb8d13d9629ef3a40ed30c94300a6d1c3b42c0
+DIST smpppd-1.60.45-3.1.src.rpm 175561 SHA256 2203eaf1e358219cd208ccb2bb104dd39408eb9b12411991b596ccc45a0b2f14 SHA512 7393891861de4dbb74f720f4db2f8a668081f643ec019a5764ae4ef03b2f088e89c566f1b6f5f2fea49b286830cb8d13d9629ef3a40ed30c94300a6d1c3b42c0 WHIRLPOOL 714c71822afd4ecfbe7f9b7653ac585fa298cf3acc44d709bcb3b80e0a62a0fbad2c62338123af727c9f6fe969a8de3e16f8cadf821f588c5b38d8a1d8bd1904
diff --git a/net-dialup/accounting/accounting-1.60.45.3.1-r1.ebuild b/net-dialup/accounting/accounting-1.60.45.3.1.ebuild
index c9f9fc4f..91d88aad 100644
--- a/net-dialup/accounting/accounting-1.60.45.3.1-r1.ebuild
+++ b/net-dialup/accounting/accounting-1.60.45.3.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2010-2018 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
-inherit estack rpm toolchain-funcs
+EAPI=5
+inherit eutils rpm toolchain-funcs
RESTRICT="mirror"
MY_PN="smpppd"
@@ -24,10 +25,10 @@ SRC_URI="http://download.opensuse.org/source/distribution/11.3/repo/oss/suse/src
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-: ${ACCOUNTING_LOG:="/var/log/accounting.log"}
+test -z "${ACCOUNTING_LOG}" && ACCOUNTING_LOG="/var/log/accounting.log"
DEPEND=">=net-dialup/ppp-2.4.4-r13"
RDEPEND="${DEPEND}"
@@ -41,7 +42,7 @@ src_prepare() {
"${CDIR}"/defines.h
sed -i -e's!/var/log/[^.]*\.log!'"${ACCOUNTING_LOG}"'!' \
"${DDIR}"/accounting.1
- default
+ epatch_user
}
src_configure() {
diff --git a/net-dialup/accounting/metadata.xml b/net-dialup/accounting/metadata.xml
index b919c846..73a6d343 100644
--- a/net-dialup/accounting/metadata.xml
+++ b/net-dialup/accounting/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/net-dialup/martian-modem/ChangeLog b/net-dialup/martian-modem/ChangeLog
new file mode 100644
index 00000000..e1799b8d
--- /dev/null
+++ b/net-dialup/martian-modem/ChangeLog
@@ -0,0 +1,45 @@
+# ChangeLog for net-dialup/martian-modem
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 27 Dec 2014; Martin Väth <martin@mvath.de>:
+ Add blocker to <openrc-0.13
+
+ 25 Dec 2014; Martin Väth <martin@mvath.de>:
+ Use openrc-run instead of deprecated runscript in initfile
+
+ 15 Mar 2014; Martin Väth <martin@mvath.de>:
+ Use readme.gentoo.eclass
+
+ 25 Feb 2012; Martin Väth <martin@mvath.de>:
+ Fix compilation with kernel 3.8. Call epatch_user.
+
+ 19 Dec 2012; Martin Väth <martin@mvath.de>:
+ Add SLOT information
+
+ 16 Dec 2012; Martin Väth <martin@mvath.de>:
+ Use from main Gentoo tree but keep grsecurity patch.
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 27 Aug 2011; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild.
+
+ 26 Aug 2011; Martin Väth <martin@mvath.de>:
+ Force sublevel to fix broken version number test for >=linux-3.0
+ Fix breakage of grsecurity
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 28 Mar 2010; Martin Väth <martin@mvath.de>:
+ martian-20080625.ebuild:
+ import with minor changes from a personal overlay.
+ See bug 285016
diff --git a/net-dialup/martian-modem/Manifest b/net-dialup/martian-modem/Manifest
index 35443121..5774fade 100644
--- a/net-dialup/martian-modem/Manifest
+++ b/net-dialup/martian-modem/Manifest
@@ -1 +1 @@
-DIST martian-full-20100123.tar.gz 275365 SHA512 bcd51103792bd1d477ab81f8bbb591f3eb5341920e6b0b35e8ba066a50b8a6ddf076c0bc0d21cf686c8137f8164221635b3c296185283f6e20ce2d04709f69ec
+DIST martian-full-20100123.tar.gz 275365 SHA256 bf3ad369dc90e3ef7952e6bb7873b3121ce79a855060a1b4b4e3a1d8e7d08ac3 SHA512 bcd51103792bd1d477ab81f8bbb591f3eb5341920e6b0b35e8ba066a50b8a6ddf076c0bc0d21cf686c8137f8164221635b3c296185283f6e20ce2d04709f69ec WHIRLPOOL b38fb4ea1e7282cf51547c4d6ab3423350dabe717ebe89efa20cc92148347d7e1b2fcc32085d3edc677768f7286715087034bace7f51415ce31a24d840c85c59
diff --git a/net-dialup/martian-modem/files/martian-modem-20100123-linux-3.10.patch b/net-dialup/martian-modem/files/martian-modem-20100123-linux-3.10.patch
deleted file mode 100644
index 63528783..00000000
--- a/net-dialup/martian-modem/files/martian-modem-20100123-linux-3.10.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- 1/kmodule/martian.c
-+++ 1/kmodule/martian.c
-@@ -184,8 +184,12 @@
- static int martian_open (struct inode *inode, struct file *filp)
- {
- // allow single open
-- struct proc_dir_entry *entry = PDE (inode);
-- struct martian *mdev = (struct martian *) entry->data;
-+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
-+ struct martian *mdev = (struct martian *) PDE_DATA (inode);
-+ #else
-+ struct proc_dir_entry *entry = PDE (inode);
-+ struct martian *mdev = (struct martian *) entry->data;
-+ #endif
-
- if (test_and_set_bit (MARTIAN_STATE_OPEN, &mdev->state)) {
- // already opened
-@@ -736,20 +740,37 @@
- // create proc entry for this device
- name[ strlen(name) - 1 ] = '0' + dev_idx;
-
-- mdev->entry = create_proc_entry (name, 0400, NULL);
-- if (! mdev->entry) {
-- MERROR ("martian: failed to create /proc/%s\n", name);
-- ret = -ENOMEM;
-- goto err_free_irq;
-- }
--
-- martian_init_mcb(mdev);
--
-- // set an index
-- mdev->index = dev_idx;
--
-- mdev->entry->proc_fops = & martian_fops;
-- mdev->entry->data = mdev;
-+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
-+ // initialize data before 3.10-style proc create call
-+ martian_init_mcb(mdev);
-+
-+ // set an index
-+ mdev->index = dev_idx;
-+
-+ mdev->entry = proc_create_data (name, 0400, NULL, & martian_fops, mdev);
-+ if (! mdev->entry) {
-+ MERROR ("martian: failed to create /proc/%s\n", name);
-+ ret = -ENOMEM;
-+ goto err_free_irq;
-+ }
-+
-+ #else
-+
-+ mdev->entry = create_proc_entry (name, 0400, NULL);
-+ if (! mdev->entry) {
-+ MERROR ("martian: failed to create /proc/%s\n", name);
-+ ret = -ENOMEM;
-+ goto err_free_irq;
-+ }
-+
-+ martian_init_mcb(mdev);
-+
-+ // set an index
-+ mdev->index = dev_idx;
-+
-+ mdev->entry->proc_fops = & martian_fops;
-+ mdev->entry->data = mdev;
-+ #endif
-
- pr_info("martian: added device %x:%x "
- "BaseAddress = 0x%x, CommAddres = 0x%x, irq = %d%s\n",
diff --git a/net-dialup/martian-modem/files/martian-modem-20100123-linux-3.8.patch b/net-dialup/martian-modem/files/martian-modem-20100123-linux-3.8.patch
deleted file mode 100644
index bdbd699c..00000000
--- a/net-dialup/martian-modem/files/martian-modem-20100123-linux-3.8.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- 1/kmodule/martian.c
-+++ 1/kmodule/martian.c
-@@ -592,7 +592,7 @@
-
- static int dev_idx = 0;
-
--static void __devinit
-+static void
- martian_configure_isr (struct martian *mdev)
- {
- struct martian_common *mcb = mdev->common;
-@@ -614,7 +614,7 @@
- mcb->dp_bamil_rd7 = 0xff;
- }
-
--static void __devinit
-+static void
- martian_configure_params (struct martian *mdev)
- {
- mdev->params.dsp_mars = mdev->metrics.dsp_mars;
-@@ -792,7 +792,7 @@
-
- /***** PCI Driver Interface *****/
-
--static int __devinit
-+static int
- martian_device_gatherinfo (const struct pci_dev *dev, const struct pci_device_id *ent, struct martian_metrics *metrics)
- {
- int bar;
-@@ -997,7 +997,7 @@
- return 0;
- }
-
--static int __devinit
-+static int
- mars_device_probe (struct pci_dev *dev, const struct pci_device_id *ent)
- {
- int ret;
-@@ -1036,7 +1036,7 @@
- }
-
-
--static void __devexit mars_remove (struct pci_dev *dev)
-+static void mars_remove (struct pci_dev *dev)
- {
- martian_del (pci_get_drvdata (dev));
- pci_disable_device (dev);
-@@ -1048,7 +1048,7 @@
- struct pci_driver martian_driver = {
- .name = "martian",
- .probe = mars_device_probe,
-- .remove = __devexit_p (mars_remove),
-+ .remove = mars_remove,
- .id_table = martian_ids
- };
-
-@@ -1062,7 +1062,7 @@
-
- #define SERIAL_DRIVER "serial"
-
--static void __devinit detach_from_serial_class (unsigned int class, unsigned int mask)
-+static void detach_from_serial_class (unsigned int class, unsigned int mask)
- {
- struct pci_dev *dev = NULL;
- const struct pci_device_id *entry;
-@@ -1083,7 +1083,7 @@
- }
- }
-
--static void __devinit detach_from_serial(void)
-+static void detach_from_serial(void)
- {
- detach_from_serial_class (PCI_CLASS_COMMUNICATION_SERIAL << 8, 0xffff00);
- detach_from_serial_class (PCI_CLASS_COMMUNICATION_MODEM << 8, 0xffff00);
-diff -urN martian-full-20100123.orig/kmodule/martian_ids.c martian-full-20100123/kmodule/martian_ids.c
---- 1/kmodule/martian_ids.c
-+++ 1/kmodule/martian_ids.c
-@@ -8,7 +8,7 @@
- .subvendor = (_subvendor), \
- .subdevice = PCI_ANY_ID
-
--__devinitdata static struct pci_device_id martian_ids[] = {
-+static struct pci_device_id martian_ids[] = {
- { PCI_DEVICE (PCI_VENDOR_ID_ATT, 0x440) },
- { PCI_DEVICE (PCI_VENDOR_ID_ATT, 0x441) },
- { PCI_DEVICE (PCI_VENDOR_ID_ATT, 0x442) },
diff --git a/net-dialup/martian-modem/files/martian-modem-kernel-3.8.patch b/net-dialup/martian-modem/files/martian-modem-kernel-3.8.patch
new file mode 100644
index 00000000..eb138df8
--- /dev/null
+++ b/net-dialup/martian-modem/files/martian-modem-kernel-3.8.patch
@@ -0,0 +1,22 @@
+--- kmodule/martian.c
++++ kmodule/martian.c
+@@ -46,6 +46,19 @@
+ #include "../martian.h"
+ #include "marsio.h"
+
++#ifndef __devinit
++#define __devinit
++#endif
++#ifndef __devexit
++#define __devexit
++#endif
++#ifndef __devexit_p
++#define __devexit_p
++#endif
++#ifndef __devinitdata
++#define __devinitdata
++#endif
++
+ /***** Driver globals *****/
+
+ struct proc_dir_entry *martians_proc_dir = NULL;
diff --git a/net-dialup/martian-modem/files/martian-modem.conf.d b/net-dialup/martian-modem/files/martian-modem.conf.d
index 7688cfd4..47e2f62b 100644
--- a/net-dialup/martian-modem/files/martian-modem.conf.d
+++ b/net-dialup/martian-modem/files/martian-modem.conf.d
@@ -1,5 +1,6 @@
-# Copyright 2012 Gentoo Authors
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/martian-modem/files/martian-modem.conf.d,v 1.1 2012/12/15 16:41:36 pacho Exp $
#
### Configuration for martian-modem initscript
#
diff --git a/net-dialup/martian-modem/files/martian-modem.init.d b/net-dialup/martian-modem/files/martian-modem.init.d
index 70450ee9..540d14c5 100644
--- a/net-dialup/martian-modem/files/martian-modem.init.d
+++ b/net-dialup/martian-modem/files/martian-modem.init.d
@@ -13,12 +13,12 @@ pidfile=/var/run/${SVCNAME}.pid
depend() {
need localmount
- yesno "${use_syslog}" && use syslog
+ [ "${use_syslog}" = "YES" ] && use syslog
}
start() {
- local modem
if [ -e /proc/modules ] ; then
+ local modem=
for modem in /dev/modem /dev/ttySM[0-9]* ; do
[ -e "${modem}" ] && break
done
diff --git a/net-dialup/martian-modem/martian-modem-20100123-r3.ebuild b/net-dialup/martian-modem/martian-modem-20100123-r2.ebuild
index 53d3f74b..915fb342 100644
--- a/net-dialup/martian-modem/martian-modem-20100123-r3.ebuild
+++ b/net-dialup/martian-modem/martian-modem-20100123-r2.ebuild
@@ -1,18 +1,19 @@
-# Copyright 2012-2019 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
-inherit linux-mod readme.gentoo-r1
+EAPI=5
+inherit eutils linux-mod readme.gentoo
MY_P="martian-full-${PV}"
DESCRIPTION="ltmodem alternative driver providing support for Agere Systems winmodems"
-HOMEPAGE="https://packages.debian.org/sid/martian-modem-source http://phep2.technion.ac.il/linmodems/packages/ltmodem/kernel-2.6/martian"
+HOMEPAGE="http://packages.debian.org/sid/martian-modem-source http://phep2.technion.ac.il/linmodems/packages/ltmodem/kernel-2.6/martian"
#SRC_URI="mirror://debian/pool/non-free/m/martian-modem/${MY_P}.tar.gz"
#SRC_URI="http://phep2.technion.ac.il/linmodems/packages/ltmodem/kernel-2.6/martian/${MY_P}.tar.gz"
SRC_URI="http://linmodems.technion.ac.il/packages/ltmodem/kernel-2.6/martian/${MY_P}.tar.gz"
LICENSE="GPL-2 AgereSystems-WinModem"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 -*"
IUSE=""
SLOT=0
@@ -45,11 +46,20 @@ MODULE_NAMES="martian_dev(ltmodem::kmodule)"
CONFIG_CHECK="SERIAL_8250"
SERIAL_8250_ERROR="This driver requires you to compile your kernel with serial core (CONFIG_SERIAL_8250) support."
+pkg_setup() {
+ linux-mod_pkg_setup
+
+ if kernel_is 2 4; then
+ eerror "This driver works only with 2.6 kernels!"
+ die "unsupported kernel detected"
+ fi
+}
+
src_prepare() {
# Exclude Makefile kernel version check, we used kernel_is above.
# TODO: More exactly, martian-modem-full-20100123 is for >kernel-2.6.20!
- eapply "${FILESDIR}/${P}-makefile.patch"
- eapply -p0 "${FILESDIR}/${P}-grsecurity.patch"
+ epatch "${FILESDIR}/${P}-makefile.patch"
+ epatch "${FILESDIR}/${P}-grsecurity.patch"
# fix compile on amd64
sed -i -e "/^HOST.*$/s:uname -i:uname -m:" modem/Makefile || die "sed failed"
@@ -58,20 +68,9 @@ src_prepare() {
BUILD_PARAMS="KERNEL_DIR='${KV_DIR}' SUBLEVEL='${KV_PATCH}'"
if kernel_is ge 3 8
- then
- # Per Gentoo Bug #543702, CONFIG_HOTPLUG is going away as an option. As of
- # Linux Kernel 3.8, the __dev* markings need to be removed. This patch removes
- # the use of __devinit, __devexit_p, and __devexit as the type cast simply isn't
- # needed any longer.
- eapply "${FILESDIR}/${P}-linux-3.8.patch"
- # Per Gentoo Bug #543702, "proc_dir_entry" and "create_proc_entry" Linux
- # Kernel header definition was moved and only accessible internally as of
- # Linux Kernel 3.10. This patch originates from Paul McClay (2014.05.28)
- # and posted to Ubuntu Launchpad.
- # It contains version checking code, hence can be applied unconditionally
- eapply "${FILESDIR}/${P}-linux-3.10.patch"
+ then epatch "${FILESDIR}/${PN}-kernel-3.8.patch"
fi
- default
+ epatch_user
}
src_install() {
@@ -81,7 +80,6 @@ src_install() {
dosbin modem/martian_modem
newconfd "${FILESDIR}/${PN}.conf.d" ${PN}
newinitd "${FILESDIR}/${PN}.init.d" ${PN}
- readme.gentoo_create_doc
}
pkg_postinst() {
@@ -91,5 +89,5 @@ pkg_postinst() {
elog "You have SMP (symmetric multi processor) support enabled in kernel."
elog "You should run martian-modem with --smp enabled in MARTIAN_OPTS."
fi
- readme.gentoo_print_elog
+ readme.gentoo_pkg_postinst
}
diff --git a/net-dialup/martian-modem/metadata.xml b/net-dialup/martian-modem/metadata.xml
index 3b566881..21c33b12 100644
--- a/net-dialup/martian-modem/metadata.xml
+++ b/net-dialup/martian-modem/metadata.xml
@@ -1,22 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- <description>maintainer of the updates in the mv overlay</description>
-</maintainer>
-<maintainer type="person">
+<maintainer>
<email>rogerx.oss@gmail.com</email>
<name>Roger</name>
<description>Please assign bugs</description>
</maintainer>
-<maintainer type="person">
+<maintainer>
<email>pacho@gentoo.org</email>
<description>proxy-maintainer, please CC on bugs</description>
</maintainer>
-<maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
-</maintainer>
</pkgmetadata>
diff --git a/net-dns/host/Manifest b/net-dns/host/Manifest
deleted file mode 100644
index 99d0c694..00000000
--- a/net-dns/host/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST host-20070128.tar.gz 152347 SHA512 80f4d4878af40c93f33cc6c43d19b01415e66b3939b157544b4921b9f0b83ef1baa9ce0e151d951417be92973c4b038df80efae974be4bca2bbce43299db65fc
diff --git a/net-dns/host/files/host-20070128-Makefile.patch b/net-dns/host/files/host-20070128-Makefile.patch
deleted file mode 100644
index 931c4389..00000000
--- a/net-dns/host/files/host-20070128-Makefile.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- Makefile.orig 2003-06-05 03:01:45.000000000 +0200
-+++ Makefile 2010-03-12 18:53:17.000000000 +0100
-@@ -117,16 +117,11 @@
- # Compilation definitions.
- # ----------------------------------------------------------------------
-
--DEBUGDEFS = -DDEBUG
-
- DEFS = $(CONFIGDEFS) $(DEBUGDEFS) $(SYSDEFS) $(INCLUDES)
-
--COPTS = -pipe
-
--COPTIM = -O2
--COPTIM = -O
-
--CDEBUG = -g
-
- # GCC lint-like warnings -- any warnings are likely bugs in the
- # platform headers or in gcc itself....
-@@ -139,7 +134,6 @@
- -Wswitch \
- -Wcomment \
- -Wcast-qual \
-- -Wid-clash-30 \
- -Wpointer-arith \
- -Wshadow
- #endif
-@@ -147,7 +141,6 @@
- #if $(__GNULD__) >= 1
- GNULDWARNFLAGS = -W \
- -Wall \
-- -Wid-clash-30
- #endif
-
- #if $(__GNUC__) >= 2
-@@ -169,7 +162,7 @@
- #endif
-
- CPPFLAGS = $(DEFS)
--CFLAGS = $(COPTS) $(CDEBUG) $(COPTIM) $(GCCWARNFLAGS) $(GCC2WARNFLAGS) $(GCC3WARNFLAGS)
-+CFLAGS += $(GCCWARNFLAGS) $(GCC2WARNFLAGS) $(GCC3WARNFLAGS)
-
- # Select your favorite compiler if make doesn't already know it...
- #if defined(next)
-@@ -250,7 +243,7 @@
- # Unfortunately SunOS-5.9 has only libresolv.so !!!
- #
- #if defined(NEED_LIBRESOLV) && !defined(sunos5.x) && !(BIND-8.4.x)
--LDFLAGS = -static $(GNULDWARNFLAGS)
-+LDFLAGS += $(GNULDWARNFLAGS)
- #else
- #LDFLAGS = $(GNULDWARNFLAGS)
- #endif
-@@ -294,7 +287,7 @@
- # ----------------------------------------------------------------------
-
- BINOWN = root
--BINGRP = staff
-+BINGRP = root
- BINMODE = 755
- #STRIPFLAG = -s
-
diff --git a/net-dns/host/host-20070128-r1.ebuild b/net-dns/host/host-20070128-r1.ebuild
deleted file mode 100644
index 45b39bc4..00000000
--- a/net-dns/host/host-20070128-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-inherit toolchain-funcs multilib
-
-DESCRIPTION="A powerful command-line DNS query and test tool"
-HOMEPAGE="http://www.weird.com/~woods/projects/host.html"
-SRC_URI="ftp://ftp.weird.com/pub/Planix/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="debug"
-
-# Bug 91515
-RESTRICT="${RESTRICT} test"
-
-BDEPEND=">=sys-apps/sed-4"
-
-src_prepare() {
- eapply -p0 "${FILESDIR}/${P}-Makefile.patch"
- sed -i -e "s:^\(# if defined(__alpha).*\):\1 || defined(__x86_64__):" \
- port.h || die "sed failed"
- default
-}
-
-src_compile() {
- use debug && export DEBUGDEFS="-DDEBUG"
- emake CC="$(tc-getCC)" RES_LIB="/usr/$(get_libdir)/libresolv.a"
-}
-
-src_install () {
- # This tool has slightly different format of output from "standard" host.
- # Renaming it to host-woods, hopefully this does not conflict with anything.
-
- newbin host host-woods || die "newbin failed"
- newman host.1 host-woods.1 || die "newman failed"
- dodoc RELEASE_NOTES ToDo || die "dodoc failed"
-}
diff --git a/net-dns/host/metadata.xml b/net-dns/host/metadata.xml
deleted file mode 100644
index 4edfd402..00000000
--- a/net-dns/host/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>george@gentoo.org</email>
- </maintainer>
-</pkgmetadata>
diff --git a/net-dns/noip-updater/Manifest b/net-dns/noip-updater/Manifest
deleted file mode 100644
index 31f9fe8a..00000000
--- a/net-dns/noip-updater/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST noip-2.1.9.tar.gz 152995 SHA512 3e76d39e22383dc3eceee10f8bdf791fc5ed253c756cd2d345fdd8fb9c9ab3bac6a1a6ca123a26cebbf6e615bb8f236c58d4ecf6254fcaf6b92da17f42f0dd6f
diff --git a/net-dns/noip-updater/files/noip-2.1.9-daemon.patch b/net-dns/noip-updater/files/noip-2.1.9-daemon.patch
deleted file mode 100644
index b2fb4e66..00000000
--- a/net-dns/noip-updater/files/noip-2.1.9-daemon.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur a/noip2.c b/noip2.c
---- a/noip2.c 2004-01-09 14:18:39.000000000 +0000
-+++ b/noip2.c 2007-07-20 14:02:41.100377515 +0100
-@@ -895,16 +895,13 @@
- char *err_string;
- static int startup = 1;
-
-- x = fork();
-+ x = daemon (0, 0);
- switch (x) {
- case -1: // error
- err_string = strerror(errno);
- Msg( "Can't fork!! (%s) Ending!\n", err_string);
- return FATALERR;
-- default: // parent
-- exit(0);
- case 0: //child
-- setsid();
- if (get_shm_info() == FATALERR)
- return FATALERR;
- log2syslog++;
diff --git a/net-dns/noip-updater/files/noip-2.1.9-flags.patch b/net-dns/noip-updater/files/noip-2.1.9-flags.patch
deleted file mode 100644
index 9fe05f36..00000000
--- a/net-dns/noip-updater/files/noip-2.1.9-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile 2006-09-07 09:52:55.000000000 +0200
-+++ b/Makefile 2006-09-07 09:54:54.000000000 +0200
-@@ -21,7 +21,7 @@
- # ARCH=sun
-
- ${TGT}: Makefile ${TGT}.c
-- ${CC} -Wall -g -D${ARCH} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} ${LIBS}
-+ ${CC} ${CFLAGS} -D${ARCH} -DPREFIX=\"${PREFIX}\" ${TGT}.c -o ${TGT} ${LIBS} ${LDFLAGS}
-
- install: ${TGT}
- if [ ! -d ${BINDIR} ]; then mkdir -p ${BINDIR};fi
diff --git a/net-dns/noip-updater/files/noip.service b/net-dns/noip-updater/files/noip.service
deleted file mode 100644
index dcfe4d46..00000000
--- a/net-dns/noip-updater/files/noip.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=No-IP Dynamic DNS Update Client
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/noip2 -c /etc/no-ip2.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-dns/noip-updater/files/noip2.start b/net-dns/noip-updater/files/noip2.start
deleted file mode 100644
index 20723ab2..00000000
--- a/net-dns/noip-updater/files/noip2.start
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
- need localmount
- need net
- use dns
-}
-
-checkconfig() {
- if [ ! -f /etc/no-ip2.conf ]
- then
- einfo "Answer the following questions about your no-ip account."
- noip2 -C || return 1
- fi
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting noip"
- start-stop-daemon --quiet --start -x /usr/sbin/noip2 -- -c /etc/no-ip2.conf
- eend $? "noip did not start, error code $?"
-}
-
-stop() {
- ebegin "Stopping noip"
- start-stop-daemon --quiet --stop -x /usr/sbin/noip2
- noip_ecode=$?
- eend $noip_ecode "Error stopping the noip daemon, error $noip_ecode"
- checkconfig || return 1
- ebegin "Setting noip addresses to 0.0.0.0"
- noip2 -c /etc/no-ip2.conf -i 0.0.0.0 >/dev/null 2>&1
- eend $? "Failed to set noip addresses to 0.0.0.0, error $?"
- return $noip_ecode
-}
diff --git a/net-dns/noip-updater/metadata.xml b/net-dns/noip-updater/metadata.xml
deleted file mode 100644
index a2476b09..00000000
--- a/net-dns/noip-updater/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- <description>maintainer of the updates in the mv overlay</description>
- </maintainer>
- <maintainer type="person">
- <email>boothfsec@gmail.com</email>
- <name>Francis Booth</name>
- <description>Active Maintainer, Assign bugs</description>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <longdescription lang="en">
- no-ip.com dynamic DNS updater
- </longdescription>
- <use>
- <flag name="ezipupd">Use user/group ezipupd instead of nobody: Useful if you restrict outgoing network traffic for user nobody</flag>
- </use>
-</pkgmetadata>
diff --git a/net-dns/noip-updater/noip-updater-2.1.9-r5.ebuild b/net-dns/noip-updater/noip-updater-2.1.9-r5.ebuild
deleted file mode 100644
index 04054457..00000000
--- a/net-dns/noip-updater/noip-updater-2.1.9-r5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit readme.gentoo-r1 systemd toolchain-funcs user
-
-MY_P=${P/-updater/}
-DESCRIPTION="no-ip.com dynamic DNS updater"
-HOMEPAGE="http://www.no-ip.com"
-SRC_URI="http://www.no-ip.com/client/linux/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86"
-IUSE="ezipupd"
-
-S=${WORKDIR}/${MY_P}
-
-DOC_CONTENTS="
- Configuration can be done manually via /usr/sbin/noip2 -C or
- by using this ebuild's config option.
-"
-
-src_prepare() {
- eapply "${FILESDIR}"/noip-2.1.9-flags.patch
- eapply "${FILESDIR}"/noip-2.1.9-daemon.patch
- local sedarg
- sedarg=(
- -e "s:\(#define CONFIG_FILEPATH\).*:\1 \"/etc\":"
- -e "s:\(#define CONFIG_FILENAME\).*:\1 \"/etc/no-ip2.conf\":"
- )
- ! use ezipupd || sedarg+=(
- -e "s:\"nobody\":\"ez-ipupd\":g"
- )
- sed -i "${sedarg[@]}" noip2.c || die "sed failed"
- default
-}
-
-src_compile() {
- emake \
- CC=$(tc-getCC) \
- PREFIX=/usr \
- CONFDIR=/etc
-}
-
-src_install() {
- dosbin noip2
- dodoc README.FIRST
- newinitd "${FILESDIR}"/noip2.start noip
- systemd_dounit "${FILESDIR}"/noip.service
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- use ezipupd && ! use prefix || return 0
- enewgroup ez-ipupd
- enewuser ez-ipupd -1 -1 /var/cache/ez-ipupdate ez-ipupd
- if test -d /var/cache/ez-ipupdate
- then chmod 750 /var/cache/ez-ipupdate
- chown ez-ipupd:ez-ipupd /var/cache/ez-ipupdate
- fi
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
-
-pkg_config() {
- cd /tmp
- einfo "Answer the following questions."
- noip2 -C || die
-}
diff --git a/net-firewall/firewall-mv/ChangeLog b/net-firewall/firewall-mv/ChangeLog
new file mode 100644
index 00000000..7decc361
--- /dev/null
+++ b/net-firewall/firewall-mv/ChangeLog
@@ -0,0 +1,169 @@
+# ChangeLog for net-firewall/firewall-mv
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*firewall-mv-8.13 (12 Jul 2015)
+
+ 12 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-8.12 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-8.11 (03 May 2015)
+
+ 03 May 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-8.9 (08 Feb 2015)
+
+ 08 Feb 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-8.8 (03 Feb 2015)
+
+ 03 Feb 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-8.7 (02 Feb 2015)
+
+ 02 Feb 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-8.6 (25 Dec 2014)
+
+ 27 Dec 2014; Martin Väth <martin@mvath.de>:
+ Add blocker to <openrc-0.13
+
+ 25 Dec 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+*firewall-mv-8.5 (15 Jun 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 15 Jun 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-8.4 (30 Mar 2014)
+
+ 30 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-8.3 (16 Mar 2014)
+
+ 16 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Do not fail if modules cannot be read
+
+*firewall-mv-8.2 (30 Dec 2013)
+
+ 30 Dec 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. New DROP_NOT_REJECT_OK for windows machines
+
+*firewall-mv-8.1 (29 Dec 2013)
+
+ 29 Dec 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support DHCP server, fix ALLOWUDP multiport
+
+*firewall-mv-7.3-r1 (17 Dec 2013)
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix sh path
+
+*firewall-mv-7.3 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-7.2-r1 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Shebang care
+
+*firewall-mv-7.2 (13 Oct 2013)
+
+ 13 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-7.1 (11 Oct 2013)
+
+ 11 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-6.11 (09 Sep 2013)
+
+ 09 Sep 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support loading of modules
+
+*firewall-mv-6.10 (10 Aug 2013)
+
+ 14 Aug 2013; Martin Väth <martin@mvath.de>:
+ Simplify EPREFIX (without revision bump)
+
+ 10 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support systemd
+
+*firewall-mv-6.9 (09 May 2013)
+
+ 09 May 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support old and new names (eth* lan* net*)
+
+*firewall-mv-6.8 (01 Apr 2013)
+
+ 01 Apr 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Rename eth* -> net* in defaults
+
+*firewall-mv-6.7 (13 Feb 2013)
+
+ 13 Feb 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Default to -m conntrack instead of -m state
+
+*firewall-mv-6.6 (07 May 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-6.5 (04 May 2012)
+
+ 04 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-6.4 (22 Apr 2012)
+
+ 22 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-6.3 (08 Apr 2012)
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 08 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-6.2 (28 Feb 2012)
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*firewall-mv-6.1 (04 Feb 2012)
+
+ 04 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Separate SYSCTL parameters. Add init files
+
+*firewall-mv-6.0 (02 Feb 2012)
+
+ 02 Feb 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/net-firewall/firewall-mv/Manifest b/net-firewall/firewall-mv/Manifest
index cf5da924..9a138a03 100644
--- a/net-firewall/firewall-mv/Manifest
+++ b/net-firewall/firewall-mv/Manifest
@@ -1 +1 @@
-DIST firewall-mv-13.2.tar.gz 17328 SHA512 b2cd11b94883514ed80e65539d3a015831a4106c95cbb99cc26adc24baca0698f774471f5bbbc047082c22ac69695db61929f66a6a04118e809300f6c54d21be
+DIST firewall-mv-8.13.tar.gz 15578 SHA256 784a49c7ee50432f6d9666406978d2b1a283be72d7eb6e4fd36543c5552f98a0 SHA512 4ad7e0686078254683a49ee0956c37a6bda80ece5c806f792a4cafb773fd74fda86c901e1ef1cb4ecae52fa67bd149a84c303aacc98f44b3973da600c0667cee WHIRLPOOL a721a4fd824cf10325d9cb716fb2d8843d48c9667c38c700f8fa99a4d78a81a9ad3f0999aaf2fea0b20cca8ae611164fe58a5d4b5f16429ede54fcf93000c3a7
diff --git a/net-firewall/firewall-mv/firewall-mv-13.2.ebuild b/net-firewall/firewall-mv/firewall-mv-13.2.ebuild
deleted file mode 100644
index 469a1971..00000000
--- a/net-firewall/firewall-mv/firewall-mv-13.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2012-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-inherit systemd
-
-DESCRIPTION="Initialize iptables and net-related sysctl variables"
-HOMEPAGE="https://github.com/vaeth/firewall-mv/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="split-usr"
-RDEPEND=">=app-shells/push-2.0-r2"
-DEPEND=""
-
-src_prepare() {
- if use prefix
- then sed -i \
- -e "s!/etc/!${EPREFIX}/etc/!g" \
- -e "s!/usr/!${EPREFIX}/usr/!g" \
- -- sbin/* etc/* systemd/* || die
- else sed -i \
- -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}$(get_usr)/bin/sh"'"' \
- -- sbin/* || die
- fi
- default
-}
-
-src_compile() {
- emake "SYSTEMUNITDIR=$(systemd_get_systemunitdir)" BINDIR="$(get_usr)/sbin" LIBDIR="$(get_usr)/lib/firewall"
-}
-
-src_install() {
- dodoc README.md
- emake DESTDIR="${ED}" "SYSTEMUNITDIR=$(systemd_get_systemunitdir)" BINDIR="$(get_usr)/sbin" LIBDIR="$(get_usr)/lib/firewall" install
-}
-
-get_usr() {
- use split-usr || echo /usr
-}
diff --git a/net-firewall/firewall-mv/firewall-mv-8.13.ebuild b/net-firewall/firewall-mv/firewall-mv-8.13.ebuild
new file mode 100644
index 00000000..4584ba78
--- /dev/null
+++ b/net-firewall/firewall-mv/firewall-mv-8.13.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils systemd
+
+DESCRIPTION="Initialize iptables and net-related sysctl variables"
+HOMEPAGE="https://github.com/vaeth/firewall-mv/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="!<sys-apps/openrc-0.13
+ app-shells/push"
+DEPEND=""
+
+src_prepare() {
+ if use prefix
+ then sed -i \
+ -e "s!/etc/!${EPREFIX}/etc/!g" \
+ -e "s!/usr/!${EPREFIX}/usr/!g" \
+ -- sbin/* etc/* systemd/* || die
+ else sed -i \
+ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+ -- sbin/* || die
+ fi
+ epatch_user
+}
+
+src_install() {
+ into /
+ dosbin sbin/*
+ insinto /etc
+ doins -r etc/*
+ insinto /usr/lib/modules-load.d
+ doins modules-load.d/*
+ insinto /usr/share/zsh/site-functions
+ doins zsh/*
+ doconfd openrc/conf.d/*
+ doinitd openrc/init.d/*
+ dodoc README
+ systemd_dounit systemd/*
+}
diff --git a/net-firewall/firewall-mv/metadata.xml b/net-firewall/firewall-mv/metadata.xml
index 62185dea..3f9b1748 100644
--- a/net-firewall/firewall-mv/metadata.xml
+++ b/net-firewall/firewall-mv/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/net-misc/netctl/Manifest b/net-misc/netctl/Manifest
deleted file mode 100644
index b4bbb75b..00000000
--- a/net-misc/netctl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST netctl-1.11.tar.xz 43868 SHA512 00bf4b016d755796980d492305332230a2089e843bf0921a7fd28ef17400e024bac0987a08c4caadf1c19becae73ce7f33d1e51ce1ea9f47e0129e1aff1ccd71
diff --git a/net-misc/netctl/metadata.xml b/net-misc/netctl/metadata.xml
deleted file mode 100644
index 7a38bb90..00000000
--- a/net-misc/netctl/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-misc/netctl/netctl-1.11.ebuild b/net-misc/netctl/netctl-1.11.ebuild
deleted file mode 100644
index b0285d3b..00000000
--- a/net-misc/netctl/netctl-1.11.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 optfeature
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="git://projects.archlinux.org/netctl.git"
- inherit git-2
- DEPEND="app-text/asciidoc"
-else
- SRC_URI="https://sources.archlinux.org/other/packages/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Profile based network connection tool from Arch Linux"
-HOMEPAGE="https://wiki.archlinux.org/index.php/Netctl
- https://www.archlinux.org/packages/core/any/netctl/
- https://projects.archlinux.org/netctl.git/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
- virtual/pkgconfig
- sys-apps/systemd
-"
-RDEPEND="
- >=app-shells/bash-4.0
- >=net-dns/openresolv-3.5.4-r1
- sys-apps/iproute2
- sys-apps/systemd
- !<net-misc/dhcpcd-6.4.0
-"
-
-src_prepare() {
- sed -i -e "s:/usr/bin/ifplugd:/usr/sbin/ifplugd:" \
- "services/netctl-ifplugd@.service" || die
- default
-}
-
-src_compile() {
- :
-}
-
-src_install() {
- emake DESTDIR="${D%/}" SHELL=bash install
- dodoc AUTHORS NEWS README
- newbashcomp contrib/bash-completion netctl
- insinto /usr/share/zsh/site-functions
- newins contrib/zsh-completion _netctl
-}
-
-pkg_postinst() {
- optfeature "DHCP support" net-misc/dhcpcd ">=net-misc/dhcp-5.6.7[client]"
- optfeature "WPA support" net-wireless/wpa_supplicant
- optfeature "interactive assistant" dev-util/dialog
- optfeature "automatic connection" sys-apps/ifplugd
- optfeature "bonding support" net-misc/ifenslave
- optfeature "dialup support" net-dialup/ppp
-}
diff --git a/net-misc/openrdate/Manifest b/net-misc/openrdate/Manifest
deleted file mode 100644
index b1221dd7..00000000
--- a/net-misc/openrdate/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST openrdate-1.2.tar.gz 118030 SHA512 5469352c26883863442641b47cc76512590af1524ecaa51fb829ae027d413889626b5b8098de0bea177a3c0ac411986518380e9400f20ddd3d4ac0bffb042e11
diff --git a/net-misc/openrdate/files/openrdate-1.1.3-rename.patch b/net-misc/openrdate/files/openrdate-1.1.3-rename.patch
deleted file mode 100644
index 5f4774c3..00000000
--- a/net-misc/openrdate/files/openrdate-1.1.3-rename.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Name the binary 'openrdate' as so not to conflict with the pre-existing ancient
-rdate.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar openrdate-1.1.3.orig/Makefile.am openrdate-1.1.3/Makefile.am
---- openrdate-1.1.3.orig/Makefile.am 2007-11-10 21:15:31.000000000 -0800
-+++ openrdate-1.1.3/Makefile.am 2008-06-18 14:27:40.001963783 -0700
-@@ -1,15 +1,15 @@
- SUBDIRS = src
-
--bin_PROGRAMS = rdate
-+bin_PROGRAMS = openrdate
-
--rdate_SOURCES= \
-+openrdate_SOURCES= \
- src/rdate.c
-
--rdate_LDADD= \
-+openrdate_LDADD= \
- src/librdate.a
-
- man_MANS= \
-- docs/rdate.8
-+ docs/openrdate.8
-
- EXTRA_DIST= \
-- docs/rdate.8
-+ $(man_MANS)
diff --git a/net-misc/openrdate/files/openrdate-confd b/net-misc/openrdate/files/openrdate-confd
deleted file mode 100644
index cba9ca55..00000000
--- a/net-misc/openrdate/files/openrdate-confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2005 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# the NTP or RFC868/time server to get the date from
-RDATE_SERVER="pool.ntp.org"
-
-# Options to pass to rdate
-# "-s" is mandatory to set the system time, and
-# is passed regardless of this variable.
-# "-n" says that we are using an NTP server instead of a RFC868/time server.
-# "-c" is for leap seconds, which is needed on NTP servers.
-OPENRDATE_OPTS="-n -c"
diff --git a/net-misc/openrdate/files/openrdate-initd b/net-misc/openrdate/files/openrdate-initd
deleted file mode 100644
index d01bb2e8..00000000
--- a/net-misc/openrdate/files/openrdate-initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- before cron
- need net
- use dns
-}
-
-checkconfig() {
- if [ -z "${RDATE_SERVER}" ] ; then
- eerror "Please edit /etc/conf.d/openrdate"
- eerror "I need to know what server to use!"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return $?
-
- ebegin "Setting clock via openrdate"
- /usr/bin/openrdate -s ${OPENRDATE_OPTS} ${RDATE_SERVER} > /dev/null
- eend $? "Failed to set clock via openrdate"
-}
diff --git a/net-misc/openrdate/files/sysctl.patch b/net-misc/openrdate/files/sysctl.patch
deleted file mode 100644
index ec1536da..00000000
--- a/net-misc/openrdate/files/sysctl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 1/src/arc4random.c
-+++ 1/src/arc4random.c
-@@ -44,7 +44,9 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/time.h>
-+#ifdef HAVE_SYSCTL
- #include <sys/sysctl.h>
-+#endif
-
- #if defined __NO_SYSCTL__
- #include <err.h>
diff --git a/net-misc/openrdate/metadata.xml b/net-misc/openrdate/metadata.xml
deleted file mode 100644
index bbbc6855..00000000
--- a/net-misc/openrdate/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>robbat2@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">openrdate</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-misc/openrdate/openrdate-1.2.ebuild b/net-misc/openrdate/openrdate-1.2.ebuild
deleted file mode 100644
index ce40e469..00000000
--- a/net-misc/openrdate/openrdate-1.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="use TCP or UDP to retrieve the current time of another machine"
-HOMEPAGE="https://sourceforge.net/projects/openrdate/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.1.3-rename.patch
- "${FILESDIR}"/sysctl.patch
-)
-
-src_prepare() {
- default
- eautomake
- mv docs/{,open}rdate.8
-}
-
-src_configure() {
- export CFLAGS="${CFLAGS-} -D__NO_SYSCTL__"
- default
-}
-
-src_install(){
- emake -j1 DESTDIR="${D}" install || die "make install failed"
- newinitd "${FILESDIR}"/openrdate-initd openrdate
- newconfd "${FILESDIR}"/openrdate-confd openrdate
-}
diff --git a/net-misc/sshstart/ChangeLog b/net-misc/sshstart/ChangeLog
new file mode 100644
index 00000000..e919f28b
--- /dev/null
+++ b/net-misc/sshstart/ChangeLog
@@ -0,0 +1,83 @@
+# ChangeLog for net-misc/sshstart
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*sshstart-2.15 (04 Sep 2015)
+
+ 04 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sshstart-2.14 (02 Sep 2015)
+
+ 02 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sshstart-2.13 (12 Jul 2015)
+
+ 12 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sshstart-2.12 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sshstart-2.11 (30 Mar 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 30 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sshstart-2.10-r1 (17 Dec 2013)
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix sh path
+
+*sshstart-2.10 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sshstart-2.9 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Shebang care
+
+*sshstart-2.8 (07 May 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sshstart-2.7 (04 May 2012)
+
+ 04 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sshstart-2.6 (08 Apr 2012)
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 08 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sshstart-2.5 (28 Feb 2012)
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*sshstart-2.4 (13 Feb 2012)
+
+ 13 Feb 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/net-misc/sshstart/Manifest b/net-misc/sshstart/Manifest
index 10748676..9476acf8 100644
--- a/net-misc/sshstart/Manifest
+++ b/net-misc/sshstart/Manifest
@@ -1 +1 @@
-DIST sshstart-4.10.tar.gz 4558 SHA512 7977db50d673f0fa632de38405eb8a9df61f77e6c94d431befdcd15f967bddf10cdcfb8d4e87e944b7dc6211cead70d10a06e5bc790b3f4c107e8ad9f354d320
+DIST sshstart-2.15.tar.gz 2479 SHA256 30b269c6c017bae176aa144383ffae3cd82b1f990049b9e6ac2ac9d8428a5d19 SHA512 d27c1568b14a11209f8605f837bb885ce3ef763afbbe76135f76ef4e1e2d4cd0cb7cceb31008a67a33dca95335dbb818cbe54acd7fa5f61de63e415c276c0e77 WHIRLPOOL 4a10dae6c38990f7bd41a11117043253ad8365c2ab76442c6b51d767742347c3aa2a5c6701e01efb3a93d1dfd5eb8a3067a1575cad76ac15dee036a1ff94ec90
diff --git a/net-misc/sshstart/metadata.xml b/net-misc/sshstart/metadata.xml
index defde85e..b59a0326 100644
--- a/net-misc/sshstart/metadata.xml
+++ b/net-misc/sshstart/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
@@ -13,4 +13,7 @@
<bugs-to>mailto:martin@mvath.de</bugs-to>
<remote-id type="github">vaeth/sshstart</remote-id>
</upstream>
+ <use>
+ <flag name="keychain">Pull in keychain as dependency. Not required, but recommended for smoother operation.</flag>
+ </use>
</pkgmetadata>
diff --git a/net-misc/sshstart/sshstart-2.15.ebuild b/net-misc/sshstart/sshstart-2.15.ebuild
new file mode 100644
index 00000000..a12d6f9f
--- /dev/null
+++ b/net-misc/sshstart/sshstart-2.15.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils
+
+DESCRIPTION="Start ssh-agent/ssh-add only if you really use ssh or friends"
+HOMEPAGE="https://github.com/vaeth/sshstart/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+keychain"
+RDEPEND="app-shells/push
+ keychain? ( net-misc/keychain )"
+DEPEND=""
+
+src_prepare() {
+ use prefix || sed -i \
+ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+ -- "${PN}" || die
+ epatch_user
+}
+
+src_install() {
+ dobin "${PN}"
+ dodoc README
+}
diff --git a/net-misc/sshstart/sshstart-4.10.ebuild b/net-misc/sshstart/sshstart-4.10.ebuild
deleted file mode 100644
index d04305c7..00000000
--- a/net-misc/sshstart/sshstart-4.10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2012-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="Start ssh-agent/ssh-add only if you really use ssh or friends"
-HOMEPAGE="https://github.com/vaeth/sshstart/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-RDEPEND=">=app-shells/push-2.0-r2
- !<dev-vcs/git-wrappers-2.0"
-DEPEND=""
-
-src_prepare() {
- local i
- use prefix || for i in bin/*
- do test -h "${i}" || sed -i \
- -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
- -- "${i}" || die
- done
- default
-}
-
-src_install() {
- local i
- insinto /usr/bin
- for i in bin/*
- do if test -h "${i}"
- then doins "${i}"
- else dobin "${i}"
- fi
- done
- insinto /usr/share/zsh/site-functions
- doins zsh/*
- dodoc README.md
-}
diff --git a/net-print/foo2zjs/ChangeLog b/net-print/foo2zjs/ChangeLog
new file mode 100644
index 00000000..ed472518
--- /dev/null
+++ b/net-print/foo2zjs/ChangeLog
@@ -0,0 +1,30 @@
+# ChangeLog for net-print/foo2zjs
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 29 Apr 2013; Martin Väth <martin@mvath.de>:
+ Simplify for EAPI=5
+
+ 02 Jan 2013; Martin Väth <martin@mvath.de>:
+ Depend only on virtual/udev
+
+ 12 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 29 Jun 2010; Martin Väth <martin@mvath.de>:
+ foo2zjs-20081129-r1.ebuild:
+ Bump to force upgrade.
+
+ 28 Mar 2010; Martin Väth <martin@mvath.de>:
+ foo2zjs-20081129.ebuild:
+ import with minor changes from a personal overlay.
+ The change from the tree is the fixing of bug 271079
diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index efad93fa..0a74a3a3 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -1 +1,19 @@
-DIST foo2zjs-20200221.tar.xz 6330264 SHA512 8d992b48157189b800a2ba2f8e528f0c3d59a532e6172f2979c4b3f6fa9a3ac7167e0e28195019b70e260d2459ebd17aba118735d5a2c8e5c7603c750ea8dfaf
+DIST cpplxp.exe 4799488 SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af
+DIST foo2zjs-20081129.tar.gz 1556478 SHA256 7b372e51a1251445f0150a7160148f4682ca32a2253f8ae9cbb845283b883b97
+DIST hpclj2600n.tar.gz 573660 SHA256 1f2c92055f22a7a6526b84b2c31e36ce1a6de003f66b31eb60cd400b84e213b6
+DIST km2430.tar.gz 929112 SHA256 88e21cc7f5c124223a6e4baea9d18dfae4a74f28f500dfae8e035495434ff572
+DIST km2530.tar.gz 2045958 SHA256 36226589e899f5d79476f5a718575eed51e81a81632ea11ba5db9e289572fb9b
+DIST lexc500.tar.gz 239577 SHA256 823fd57b2e1b5aa6ed7a07055616238ed9b02e324b9d1c5f4f281e5ae4b0a667
+DIST m22dlicc.exe 634368 SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3
+DIST m23dlicc.exe 170496 SHA256 1416cda7e2e3496ff1d121c87dd8984ad1d16ed3396096f05f4919dafd445ae4
+DIST okic3200.tar.gz 527532 SHA256 f5503854d4537868d24a797912b2fa70c1fb5e0f097fc61a45f100725a064521
+DIST okic3400.tar.gz 453326 SHA256 5f64ac0002c6f2f25d481bada150121d7d77e29e616de0639446903904043a70
+DIST okic5600.tar.gz 674998 SHA256 7b2d59d54ecefecd053766bdb1d81db08c9d32979031cb8c4e2d5162d7d8f6bd
+DIST samclp300.tar.gz 427584 SHA256 cf7eaca16a6a1892e13cd87825dcb57060c4c50815a52b0f2cb09b27304ec140
+DIST sihp1000.tar.gz 50416 SHA256 28ee34195a976212800c6abd29047c297c4367aaf727f279e16de297f13562f5
+DIST sihp1005.tar.gz 52297 SHA256 fb044ea77cbe3c5e2f86d00db02733ab1f8bdf102fcbfc55ba4eb2bee94535ee
+DIST sihp1018.tar.gz 70544 SHA256 95505c88af25d0c2130077af68e0404d88fc8dfb0a58943bdb9313f3e6c10f10
+DIST sihp1020.tar.gz 70139 SHA256 c6117961ff9a4a1a880093daea52d800636f6c1002e4cf4fda2009f08f652751
+DIST sihpP1005.tar.gz 153447 SHA256 9672c09945f4d1b19841187b30832f3afdfbdf0a1e770f41d95c1575fb865c5c
+DIST sihpP1006.tar.gz 153532 SHA256 7974d669cd68a88674e0b6c44c5fa48f7c6625d16714cac6ded7b26024184f50
+DIST sihpP1505.tar.gz 166072 SHA256 f631bce116447af89b1740c3b9732666348579a9dcd96d6f31121d5586332f35
diff --git a/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch b/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch
new file mode 100644
index 00000000..8391dad8
--- /dev/null
+++ b/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch
@@ -0,0 +1,145 @@
+diff -urN foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile
+--- foo2zjs.orig/icc2ps/Makefile 2007-11-27 22:13:53.000000000 +0100
++++ foo2zjs/icc2ps/Makefile 2008-12-02 13:51:12.000000000 +0100
+@@ -1,11 +1,11 @@
+ UNAME := $(shell uname)
+-PREFIX= /usr
++PREFIX= $(DESTDIR)/usr
+ BIN= $(PREFIX)/bin
+ SRC= icc2ps.c xgetopt.c
+ LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
+ cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \
+ cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c
+-CFLAGS= -O3
++CFLAGS?= -O3
+ INSTALL=install
+ ifeq ($(UNAME),SunOS)
+ INSTALL=/usr/ucb/install
+diff -urN foo2zjs.orig/Makefile foo2zjs/Makefile
+--- foo2zjs.orig/Makefile 2008-09-23 15:56:20.000000000 +0200
++++ foo2zjs/Makefile 2008-12-02 14:00:42.000000000 +0100
+@@ -251,7 +251,7 @@
+ endif
+
+ # Compiler flags
+-CFLAGS += -O2 -Wall
++CFLAGS ?= -O2 -Wall
+ #CFLAGS += -g
+
+ #
+@@ -543,14 +543,15 @@
+ UDEVBIN=$(DESTDIR)/bin/
+
+ install-prog:
++ [ -d $(BIN) ] || install -d -m 755 $(BIN)/
++ [ -d $(DESTDIR)/bin/ ] || install -d -m 755 $(DESTDIR)/bin/
+ #
+ # Install driver, wrapper, and development tools
+ #
+ $(INSTALL) -d $(BIN)
+ $(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/
+ if [ "$(BINPROGS)" != "" ]; then \
+- $(INSTALL) -d $(UDEVBIN); \
+- $(INSTALL) -c $(BINPROGS) $(UDEVBIN); \
++ install -c $(BINPROGS) $(DESTDIR)/bin/; \
+ fi
+ #
+ # Install gamma correction files. These are just templates,
+@@ -570,6 +571,7 @@
+ #
+ # Remove obsolete foomatic database files from previous versions
+ #
++ mkdir -p $(FOODB)/opt/
+ rm -f $(FOODB)/opt/foo2zjs-Media.xml
+ rm -f $(FOODB)/opt/foo2zjs-PaperSize.xml
+ rm -f $(FOODB)/opt/foo2zjs-Source.xml
+@@ -583,6 +585,7 @@
+ # Install current database files
+ #
+ @if [ -d $(FOODB) ]; then \
++ [ -d $(FOODB)/$$dir/ ] || install -d -m 755 $(FOODB)/$$dir/; \
+ for dir in driver printer opt; do \
+ echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
+ $(INSTALL) -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
+@@ -601,10 +604,10 @@
+ #
+ # Clear foomatic cache and rebuild database if needed
+ #
+- rm -rf /var/cache/foomatic/*/*
+- rm -f /var/cache/foomatic/printconf.pickle
+- if [ -d /var/cache/foomatic/compiled ]; then \
+- cd /var/cache/foomatic/compiled; \
++ rm -rf $(DESTDIR)/var/cache/foomatic/*/*
++ rm -f $(DESTDIR)/var/cache/foomatic/printconf.pickle
++ if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \
++ cd $(DESTDIR)/var/cache/foomatic/compiled; \
+ foomatic-combo-xml -O >overview.xml; \
+ fi
+
+@@ -736,13 +739,6 @@
+ done; \
+ ppdmgr -u; \
+ elif [ -d $(PPD) ]; then \
+- find $(PPD) -name '*foo2zjs*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2hp*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2xqx*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2lava*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2qpdl*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2slx*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2hiperc*' | xargs rm -rf; \
+ [ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \
+ cd PPD; \
+ for ppd in *.ppd; do \
+@@ -789,10 +785,8 @@
+ $(INSTALL) -c -m 755 hplj10xx_gui.tcl $(SHAREZJS)
+
+
+-USBDIR=/etc/hotplug/usb
+-UDEVDIR=/etc/udev/rules.d
+-RULES=hplj10xx.rules
+-install-hotplug: install-hotplug-test install-hotplug-prog
++USBDIR=$(DESTDIR)/etc/hotplug/usb
++install-hotplug: install-hotplug-test install-udev
+
+ install-hotplug-test:
+ #
+@@ -810,9 +804,6 @@
+ #
+
+ install-hotplug-prog:
+- if [ -d $(UDEVDIR) ]; then \
+- $(INSTALL) -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES); \
+- fi
+ [ -d $(USBDIR) ] || $(INSTALL) -d -m 755 $(USBDIR)/
+ $(INSTALL) -c -m 755 hplj1000 $(USBDIR)/
+ ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005
+@@ -823,15 +814,12 @@
+ ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1007
+ ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1008
+ ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1505
+- $(USBDIR)/hplj1000 install-usermap
+- $(USBDIR)/hplj1005 install-usermap
+- $(USBDIR)/hplj1018 install-usermap
+- $(USBDIR)/hplj1020 install-usermap
+- $(USBDIR)/hpljP1005 install-usermap
+- $(USBDIR)/hpljP1006 install-usermap
+- $(USBDIR)/hpljP1007 install-usermap
+- $(USBDIR)/hpljP1008 install-usermap
+- $(USBDIR)/hpljP1505 install-usermap
++ install -c -m 644 hplj.usermap $(USBDIR)/
++UDEVDIR=$(DESTDIR)/etc/udev/rules.d
++RULES=hplj10xx.rules
++install-udev:
++ [ -d $(UDEVDIR) ] || install -d -m 755 $(UDEVDIR)/
++ install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES)
+
+ cups: FRC
+ if [ -x /etc/init.d/cups ]; then \
+@@ -1223,7 +1211,6 @@
+ $(INSTALL) -c -m 644 README $(DOCDIR)
+ $(INSTALL) -c -m 644 ChangeLog $(DOCDIR)
+
+-GROFF=/usr/local/test/bin/groff
+ GROFF=groff
+ manual.pdf: $(MANPAGES)
+ -$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@
diff --git a/net-print/foo2zjs/files/foo2zjs-20081129-udevfwld.patch b/net-print/foo2zjs/files/foo2zjs-20081129-udevfwld.patch
new file mode 100644
index 00000000..808b32f1
--- /dev/null
+++ b/net-print/foo2zjs/files/foo2zjs-20081129-udevfwld.patch
@@ -0,0 +1,273 @@
+--- 1/Makefile
++++ 1/Makefile
+@@ -20,6 +20,10 @@
+ PREFIX=/usr
+ PREFIX=$(DESTDIR)/usr
+
++# USB_PRINTERID is also installed there because it is needed by the FWloader
++FWLOADERDIR=$(DESTDIR)/sbin
++FIRMWAREDIR=$(DESTDIR)/lib/firmware
++
+ # Pathnames for this package...
+ BIN=$(PREFIX)/bin
+ SHAREZJS=$(PREFIX)/share/foo2zjs
+@@ -661,21 +665,21 @@
+ fi; \
+ done
+ # foo2zjs Firmware files (if any)
+- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/firmware/
++ $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
+ for i in sihp1*.img; do \
+ if [ -f $$i ]; then \
+ base=`basename $$i .img`; \
+ ./arm2hpdl $$i >$$base.dl; \
+- $(INSTALL) -c -m 644 $$base.dl $(SHAREZJS)/firmware/; \
++ $(INSTALL) -c -m 644 $$base.dl $(FIRMWAREDIR)/; \
+ fi; \
+ done
+ # foo2xqx Firmware files (if any)
+- $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(SHAREXQX)/firmware/
++ $(INSTALL) $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/
+ for i in sihpP*.img; do \
+ if [ -f $$i ]; then \
+ base=`basename $$i .img`; \
+ ./arm2hpdl $$i >$$base.dl; \
+- $(INSTALL) -c -m 644 $$base.dl $(SHAREXQX)/firmware/; \
++ $(INSTALL) -c -m 644 $$base.dl $(FIRMWAREDIR)/; \
+ fi; \
+ done
+ # foo2oak ICM files (if any)
+@@ -818,6 +822,8 @@
+ UDEVDIR=$(DESTDIR)/etc/udev/rules.d
+ RULES=hplj10xx.rules
+ install-udev:
++ [ -d $(FWLOADERDIR) ] || install -d -m 755 $(FWLOADERDIR)/
++ install -c -m 755 foo2zjs-loadfw $(FWLOADERDIR)/
+ [ -d $(UDEVDIR) ] || install -d -m 755 $(UDEVDIR)/
+ install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES)
+
+--- foo2zjs-loadfw
++++ foo2zjs-loadfw
+@@ -0,0 +1,151 @@
++#!/bin/sh
++
++# foo2zjs-loadfw:
++#
++# Hotplug script for 100[05],1018,1020,P100[5678],P1505,P1505n
++# USB laser printers. The model number
++# that this script deals with is determined from the udev env.
++#
++# Used to download firmware automatically into the printer when it
++# is powered up or plugged into the USB port.
++#
++# The inspiration fo this script is from:
++# Oscar Santacreu. Alicante-Spain (2002)
++# Mike Morgan (2004)
++# Modified by Stefan Schweizer (2005) to work as a udev-RUN-script
++
++#
++# Directory to find downloadable HP firmware files sihpMMMM.dl
++#
++FWDIR=/lib/firmware
++
++#
++# Program used to determine USB printer id information
++#
++USBID=/bin/usb_printerid
++
++#
++# Timeout to load firmware
++#
++TIMEOUT=6
++
++#
++# Figure out how to log our messages
++#
++if [ -t 1 ]; then
++ # Running from a tty...
++ log() {
++ echo "$0: $@"
++ }
++elif [ -x /usr/bin/logger ]; then
++ # Have logger...
++ log() {
++ logger -t "$0" -- "$@"
++ }
++else
++ # No logger...
++ log() {
++ echo "$0: $@" >> /var/log/messages
++ }
++fi
++
++#
++# Figure out the model number from the argument of this script
++#
++MODELNAME=''
++FWMODEL=''
++case "$1" in
++P1005)
++ MODEL=P1005
++ ;;
++P1006)
++ MODEL=P1006
++ ;;
++P1007)
++ MODEL=P1007
++ FWMODEL=P1005
++ ;;
++P1008)
++ MODEL=P1008
++ FWMODEL=P1006
++ ;;
++P1505)
++ MODEL=P1505
++ ;;
++P1505n)
++ MODEL=P1505n
++ FWMODEL=P1505
++ ;;
++1000)
++ MODEL=1000
++ MODELNAME="hp LaserJet $MODEL"
++ ;;
++1005)
++ MODEL=1005
++ MODELNAME="hp LaserJet $MODEL"
++ ;;
++1018)
++ MODEL=1018
++ ;;
++1020)
++ MODEL=1020
++ ;;
++*)
++ log "Only HP LaserJet 100[05],1018,1020,P100[5678],P1505,P1505n are supported"
++ log "You need to supply one of these on the cmdline: $0 10**"
++ exit
++ ;;
++esac
++: ${MODELNAME:="HP LaserJet $MODEL"}
++: ${FWMODEL:="$MODEL"}
++
++if [ -n "$2" ]; then
++ DEVNAME=$2
++elif [ -n "$DEVNAME" ]; then
++ log 'using $DEVNAME'
++else
++ log "You need to either have $DEVNAME set in the environment or supply it on the cmdline, like:"
++ log "$0 10** /dev/usb/lp0"
++ exit 1
++fi
++
++#
++# Procedure to load a single device with firmware
++#
++load1() {
++ fw="$FWDIR/sihp$FWMODEL.dl"
++ if [ ! -f "$fw" ]; then
++ log "Missing HP LaserJet $MODEL firmware file $fw"
++ log "...read foo2zjs installation instructions and run ./getweb $MODEL"
++ return 1
++ fi
++
++ log "loading HP LaserJet $MODEL firmware $fw to $DEVNAME ..."
++ if cat $fw > $DEVNAME; then
++ sleep $TIMEOUT
++ log "... download successful."
++ else
++ log "... download failed."
++ fi
++ return 0
++}
++
++#
++# OK, now download firmware to any printers that need it
++#
++if [ -x $USBID ]; then
++ if $USBID $DEVNAME | grep "$MODELNAME" 2> /dev/null; then
++ # This is a LaserJet 100x
++ if $USBID $DEVNAME | grep 'FWVER' 2> /dev/null; then
++ log "HP LaserJet $MODEL firmware already loaded into $DEVNAME"
++ else
++ # Firmware is not yet loaded
++ load1 "$DEVNAME"
++ fi
++ else
++ log "No supported printer found."
++ fi
++else
++ log "HP LaserJet $MODEL firmware was not downloaded..."
++ log "...couldn't find $USBID"
++fi
+--- hplj1000
++++ hplj1000
+@@ -35,7 +35,7 @@
+ #
+ # Directory to find downloadable HP firmware files sihpMMMM.dl
+ #
+-FWDIR=/usr/share/foo2zjs/firmware
++FWDIR=/lib/firmware
+
+ #
+ # Program used to determine USB printer id information
+--- hplj10xx.rules
++++ hplj10xx.rules
+@@ -1,36 +1,21 @@
+-#Own udev rule for HP Laserjet 1000
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="hp LaserJet 1000", NAME="usb/%k", \
+- SYMLINK+="hplj1000-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1000"
+-#Own udev rule for HP Laserjet 1005
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="hp LaserJet 1005 series", NAME="usb/%k", \
+- SYMLINK+="hplj1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005"
+-#Own udev rule for HP Laserjet 1018
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="HP LaserJet 1018", NAME="usb/%k", \
+- SYMLINK+="hplj1018-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1018"
+-#Own udev rule for HP Laserjet 1020
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="HP LaserJet 1020", NAME="usb/%k", \
+- SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020"
+-#Own udev rule for HP Laserjet P1005
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="HP LaserJet P1005", NAME="usb/%k", \
+- SYMLINK+="hpljP1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1005"
+-#Own udev rule for HP Laserjet P1006
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="HP LaserJet P1006", NAME="usb/%k", \
+- SYMLINK+="hpljP1006-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1006"
+-#Own udev rule for HP Laserjet P1007
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="HP LaserJet P1007", NAME="usb/%k", \
+- SYMLINK+="hpljP1007-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1007"
+-#Own udev rule for HP Laserjet P1008
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="HP LaserJet P1008", NAME="usb/%k", \
+- SYMLINK+="hpljP1008-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1008"
+-#Own udev rule for HP Laserjet P1505
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+- SYSFS{product}=="HP LaserJet P1505", NAME="usb/%k", \
+- SYMLINK+="hpljP1505-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1505"
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="3d17", RUN+="/sbin/foo2zjs-loadfw P1005 $tempnode"
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="3e17", RUN+="/sbin/foo2zjs-loadfw P1006 $tempnode"
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="4817", RUN+="/sbin/foo2zjs-loadfw P1007 $tempnode"
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="4917", RUN+="/sbin/foo2zjs-loadfw P1008 $tempnode"
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="3f17", RUN+="/sbin/foo2zjs-loadfw P1505 $tempnode"
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="4017", RUN+="/sbin/foo2zjs-loadfw P1505n $tempnode"
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="0517", RUN+="/sbin/foo2zjs-loadfw 1000 $tempnode"
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="1317", RUN+="/sbin/foo2zjs-loadfw 1005 $tempnode"
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="4117", RUN+="/sbin/foo2zjs-loadfw 1018 $tempnode"
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++ ATTRS{idProduct}=="2b17", RUN+="/sbin/foo2zjs-loadfw 1020 $tempnode"
++
diff --git a/net-print/foo2zjs/files/foreground.patch b/net-print/foo2zjs/files/foreground.patch
deleted file mode 100644
index ec4a69c5..00000000
--- a/net-print/foo2zjs/files/foreground.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 1/hplj1000
-+++ 1/hplj1000
-@@ -220,14 +220,12 @@
- fi
-
- log "loading HP LaserJet $MODEL firmware $fw to $_dev ..."
-- # There is a timeout problem with udev and FC4, so spin it off.
-- (
- if cat $fw > $_dev; then
- log "... download successful."
- else
- log "... download failed."
-+ return 1
- fi
-- ) &
- return 0
- }
-
diff --git a/net-print/foo2zjs/files/udev.patch b/net-print/foo2zjs/files/udev.patch
deleted file mode 100644
index 8f41ab2d..00000000
--- a/net-print/foo2zjs/files/udev.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 1/Makefile
---- 1/Makefile
-@@ -933,7 +933,7 @@
- echo " *** OR (generic linux)"; \
- echo " *** # rm -f $(LIBUDEVDIR)/*-printers.rules"; \
- echo " ***"; \
-- exit 1; \
-+ # exit 1; \
- fi
- # ... OK!
- #
diff --git a/net-print/foo2zjs/files/usbbackend.patch b/net-print/foo2zjs/files/usbbackend.patch
deleted file mode 100644
index 3fdc0d29..00000000
--- a/net-print/foo2zjs/files/usbbackend.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 1/hplj1000
-+++ 1/hplj1000
-@@ -42,7 +42,7 @@
- # Path to the USB CUPS backend. We use this backend to upload the firmware
- # into the printer when we are on a CUPS/libusb-based system.
- #
--USB_BACKEND=/usr/lib/cups/backend/usb
-+USB_BACKEND=/usr/libexec/cups/backend/usb
-
- #
- # Directory to find downloadable HP firmware files sihpMMMM.dl
diff --git a/net-print/foo2zjs/foo2zjs-20081129-r1.ebuild b/net-print/foo2zjs/foo2zjs-20081129-r1.ebuild
new file mode 100644
index 00000000..ec664b77
--- /dev/null
+++ b/net-print/foo2zjs/foo2zjs-20081129-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Support for printing to ZjStream-based printers. Fixes bug 271079"
+HOMEPAGE="http://foo2zjs.rkkda.com/"
+
+# extracted by http://gentooexperimental.org/~genstef/dist/foo2zjs-helper.sh
+DEVICES=( "hp2600n" "hp1600" "hp1500" "hp1215" "km2530" "km2490" "km2480"
+"xp6115" "km2430" "km2300" "km2200" "kmcpwl" "sa300" "sa315" "sa2160"
+"sa3160" "xp6110" "lm500" "oki3200" "oki3300" "oki3400" "oki3530" "oki5100"
+"oki5200" "oki5500" "oki5600" "oki5800" "hp1020" "hp1018" "hp1005" "hp1000"
+"hpp1505" "hpp1008" "hpp1007" "hpp1006" "hpp1005" )
+#"sa610" has no file to download
+URIS=(
+"http://foo2hp.rkkda.com/icm/hpclj2600n.tar.gz
+http://foo2zjs.rkkda.com/icm/km2430.tar.gz"
+"http://foo2hp.rkkda.com/icm/hpclj2600n.tar.gz
+http://foo2zjs.rkkda.com/icm/km2430.tar.gz"
+"http://foo2hp.rkkda.com/icm/hpclj2600n.tar.gz
+http://foo2zjs.rkkda.com/icm/km2430.tar.gz"
+"http://foo2hp.rkkda.com/icm/hpclj2600n.tar.gz
+http://foo2zjs.rkkda.com/icm/km2430.tar.gz"
+"http://foo2lava.rkkda.com/icm/km2530.tar.gz"
+"http://foo2lava.rkkda.com/icm/km2530.tar.gz"
+"http://foo2lava.rkkda.com/icm/km2530.tar.gz"
+"http://foo2lava.rkkda.com/icm/km2530.tar.gz"
+"http://foo2zjs.rkkda.com/icm/km2430.tar.gz"
+"ftp://ftp.minolta-qms.com/pub/crc/out_going/other/m23dlicc.exe
+http://foo2zjs.rkkda.com/icm/km2430.tar.gz"
+"ftp://ftp.minolta-qms.com/pub/crc/out_going/win2000/m22dlicc.exe"
+"ftp://ftp.minolta-qms.com/pub/crc/out_going/windows/cpplxp.exe"
+"http://foo2qpdl.rkkda.com/icm/samclp300.tar.gz"
+"http://foo2qpdl.rkkda.com/icm/samclp300.tar.gz"
+"http://foo2qpdl.rkkda.com/icm/samclp300.tar.gz"
+"http://foo2qpdl.rkkda.com/icm/samclp300.tar.gz"
+"http://foo2qpdl.rkkda.com/icm/samclp300.tar.gz"
+"http://foo2slx.rkkda.com/icm/lexc500.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic3200.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic3400.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic3400.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic3400.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic3200.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic3200.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic5600.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic5600.tar.gz"
+"http://foo2hiperc.rkkda.com/icm/okic5600.tar.gz"
+"http://foo2zjs.rkkda.com/firmware/sihp1020.tar.gz"
+"http://foo2zjs.rkkda.com/firmware/sihp1018.tar.gz"
+"http://foo2zjs.rkkda.com/firmware/sihp1005.tar.gz"
+"http://foo2zjs.rkkda.com/firmware/sihp1000.tar.gz"
+"http://foo2zjs.rkkda.com/firmware/sihpP1505.tar.gz"
+"http://foo2zjs.rkkda.com/firmware/sihpP1006.tar.gz"
+"http://foo2zjs.rkkda.com/firmware/sihpP1005.tar.gz"
+"http://foo2zjs.rkkda.com/firmware/sihpP1006.tar.gz"
+"http://foo2zjs.rkkda.com/firmware/sihpP1005.tar.gz"
+)
+
+SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.gz"
+IUSE="cups foomaticdb usb"
+for ((DEV=0; DEV < ${#DEVICES[*]}; DEV++)); do
+ SRC_URI="${SRC_URI} foo2zjs_devices_${DEVICES[DEV]}? ( ${URIS[DEV]} )"
+ IUSE="${IUSE} foo2zjs_devices_${DEVICES[DEV]}"
+ ALL_BEGIN="${ALL_BEGIN} !foo2zjs_devices_${DEVICES[DEV]}? ("
+ ALL_MIDDLE="${ALL_MIDDLE} ${URIS[DEV]}"
+ ALL_END="${ALL_END} )"
+done
+SRC_URI="${SRC_URI}${ALL_BEGIN}${ALL_MIDDLE}${ALL_END}"
+
+LICENSE="GPL-2"
+# due to those firmwares/icms/etc...
+RESTRICT="mirror"
+SLOT="0"
+DEPEND="app-arch/unzip"
+RDEPEND="cups? ( net-print/cups )
+ foomaticdb? ( net-print/foomatic-db-engine )
+ net-print/foomatic-filters
+ virtual/udev"
+KEYWORDS="~x86 ~amd64 ~ppc"
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-Makefile.patch
+ epatch "${FILESDIR}"/${P}-udevfwld.patch
+ epatch_user
+}
+
+src_unpack() {
+ unpack ${P}.tar.gz
+
+ # link getweb files in ${S} to get unpacked
+ local i
+ for i in ${A}
+ do ln -s "${DISTDIR}"/${i} "${S}"
+ done
+}
+
+src_compile() {
+ emake getweb
+
+ # remove wget as we got the firmware with portage
+ sed -i -e "s/.*wget .*//" \
+ -e 's/.*rm $.*//' \
+ -e "s/error \"Couldn't dow.*//" getweb
+
+ # unpack files
+ GOT=0;
+ for ((DEV=0; DEV < ${#DEVICES[*]}; DEV++)); do
+ if use foo2zjs_devices_${DEVICES[DEV]}; then
+ ./getweb ${DEVICES[DEV]:2}
+ GOT=1
+ fi
+ done
+ if [ ${GOT} == 0 ]; then ./getweb all; fi
+
+ emake
+}
+
+src_install() {
+ use foomaticdb && dodir /usr/share/foomatic/db/source
+
+ use cups && dodir /usr/share/cups/model
+
+ emake DESTDIR="${ED}" install install-udev
+}
diff --git a/net-print/foo2zjs/foo2zjs-20200221.ebuild b/net-print/foo2zjs/foo2zjs-20200221.ebuild
deleted file mode 100644
index 6e484bc8..00000000
--- a/net-print/foo2zjs/foo2zjs-20200221.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Support for printing to ZjStream-based printers"
-HOMEPAGE="http://foo2zjs.rkkda.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="foomaticdb test"
-
-PATCHES=(
- "${FILESDIR}/foreground.patch"
- "${FILESDIR}/usbbackend.patch"
- "${FILESDIR}/udev.patch"
-)
-
-RESTRICT="bindist !test? ( test )"
-
-RDEPEND="net-print/cups
- foomaticdb? ( net-print/foomatic-db-engine )
- >=net-print/cups-filters-1.0.43-r1[foomatic]
- virtual/udev"
-DEPEND="${RDEPEND}
- app-arch/unzip
- app-editors/vim
- sys-apps/ed
- sys-devel/bc
- test? ( sys-process/time )"
-
-SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-
-src_prepare() {
- # Prevent an access violation.
- sed -e "s~/etc~${D}/etc~g" -i Makefile || die
- sed -e "s~/etc~${D}/etc~g" -i hplj1000 || die
-
- # Prevent an access violation, do not create symlinks on live file system
- # during installation.
- sed -e 's/ install-filter / /g' -i Makefile || die
-
- # Prevent an access violation, do not remove files from live filesystem
- # during make install
- sed -e '/rm .*LIBUDEVDIR)\//d' -i Makefile || die
- sed -e '/rm .*lib\/udev\/rules.d\//d' -i hplj1000 || die
-
- default
-}
-
-src_compile() {
- MAKEOPTS=-j1 CC="$(tc-getCC)" default
-}
-
-src_install() {
- # ppd files are installed automagically. We have to create a directory
- # for them.
- dodir /usr/share/ppd
-
- # Also for the udev rules we have to create a directory to install them.
- dodir /lib/udev/rules.d
-
- # directories we have to create if we want foomaticdb support
- use foomaticdb && dodir /usr/share/foomatic/db/source
-
- emake DESTDIR="${ED%/}" \
- USBDIR="${ED%/}/etc/hotplug/usb" \
- UDEVDIR="${ED%/}/lib/udev/rules.d" \
- LIBUDEVDIR="${ED%/}/lib/udev/rules.d" \
- DOCDIR="${ED%}/usr/share/doc/${PF}" \
- -j1 install install-hotplug
-}
-
-src_test() {
- # see bug 419787
- :
-}
diff --git a/net-print/foo2zjs/metadata.xml b/net-print/foo2zjs/metadata.xml
index 25b253a6..fd829cb5 100644
--- a/net-print/foo2zjs/metadata.xml
+++ b/net-print/foo2zjs/metadata.xml
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- <description>Maintainer of patch for the abandoned ebuild in the mv overlay</description>
-</maintainer>
-<maintainer type="project">
- <email>printing@gentoo.org</email>
- <name>Gentoo Printing Project</name>
-</maintainer>
-<use>
- <flag name="foomaticdb">Add support for the foomatic printing driver database</flag>
-</use>
+ <herd>printing</herd>
+ <maintainer>
+ <email>martin@mvath.de</email>
+ <name>Martin Väth</name>
+ <description>Maintainer of patch for the abandoned ebuild</description>
+ </maintainer>
</pkgmetadata>
diff --git a/profiles/make.defaults b/profiles/make.defaults
index 52a740fa..5eaf9274 100644
--- a/profiles/make.defaults
+++ b/profiles/make.defaults
@@ -1 +1 @@
-USE_EXPAND="BROWSER FOO2ZJS_DEVICES PDFVIEWER RENAMESCHILY SCHILYTOOLS"
+USE_EXPAND="COMPLETION"
diff --git a/profiles/package.mask b/profiles/package.mask
index a94b4a49..90901425 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,52 +1,4 @@
-# Martin Väth <martin@mvath.de> (04 Sep 2016)
-# app-accessibility/gespeaker-0.8.6_p0 is a first attempt for a gtk-3 version.
-# It does not yet compile.
-=app-accessibility/gespeaker-0.8.6_p0
-
-# Martin Väth <martin@mvath.de> (14 May 2018)
-# Sources no longer available. Probably long outdated.
-=app-admin/flexlm-9.5*
-
-# Martin Väth <martin@mvath.de> (17 May 2018)
-# The package will probably be removed from the mv repository: It is
-# useful only for arch users. The ebuild is practically unmaintained,
-# and bumps from upstream have not been made since ages.
-# Stick it in your local overlay if you really want to keep it.
-app-shells/command-not-found
-
-# Martin Väth <martin@mvath.de> (09 Apr 2018)
-# There is nothing wrong with dev-util/pyrep, but hopefully this mask will
-# make people aware about the successor project dev-util/replacer which is
-# probably better in almost any aspect. In addition, dev-util/pyrep is almost
-# unmaintained (and really old ugly code). Anyway, feel free to unmask...
-dev-util/pyrep
-
-# Martin Väth <martin@mvath.de> (03 Jan 2016)
-# net-dns/noip-updater does not use https for transferring user sensitive data,
-# see e.g. https://bugs.gentoo.org/show_bug.cgi?id=261194
-# So install only if you are aware about the security risk.
-~net-dns/noip-updater-2.1.9
-
-# Martin Väth <martin@mvath.de> (20 Jul 2016)
-# There is nothing wrong with sys-apps/starter, but it is hardly maintained.
-# Please switch to the successor project sys-fs/schedule which is superior
-# in practically every aspect.
-sys-apps/starter
-
# Martin Väth <martin@mvath.de> (10 Jan 2015)
# sys-fs/squash_dir is no longer maintained. Use instead the successor project
# sys-fs/squashmount (or sys-apps/openrc-wrapper for the openrc-wrapper script)
sys-fs/squash_dir
-
-# Martin Väth <mvath@google.com> (19 Dec 2018)
-# The mask only indicates my lack of time to maintain the ebuilds:
-# The masked version might be current or safe, but it might also be outdated
-# or even contain critical security bugs.
-# Unmask at your discretion if you have time to check.
-=www-plugins/canvasblocker-0.5.5
-=www-plugins/decentraleyes-2.0.8
-=www-plugins/duckduckgo-2018.10.24
-=www-plugins/google-translation-2.6
-=www-plugins/https-everywhere-2018.10.31
-=www-plugins/skip-redirect-2.2.1
-=www-plugins/ublock-origin-1.17.2
diff --git a/profiles/use.desc b/profiles/use.desc
index 1b8b6ced..337f6fe5 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -1,5 +1,4 @@
-browser_firefox - Install extension for www-client/firefox
-browser_firefox-bin - Install extension for the www-client/firefox-bin
-browser_seamonkey - Install extension for the www-client/seamonkey
-browser_seamonkey-bin - Install extension for the www-client/seamonkey-bin
-compressed - Install extension as a compressed .xpi
+firefox - Install extension for www-client/firefox
+firefox-bin - Install extension for the www-client/firefox-bin
+seamonkey - Install extension for the www-client/seamonkey
+seamonkey-bin - Install extension for the www-client/seamonkey-bin
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 61ef73ee..c138eae8 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2,222 +2,124 @@
# your descriptions to your package's metadata.xml ONLY.
# * generated automatically using egencache *
-app-cdr/cdrtools:schily-tools - Use libschily from app-shells/schily-tools
-app-mobilephone/adb-sync:channel - Install the adb-channel script
app-portage/eix:debug - Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.
-app-portage/eix:dep - Make DEP=true the default which enables support for {,R,P,B}DEPEND but requires roughly double disk and memory.
+app-portage/eix:dep - Make DEP=true the default which enables support for {,R,P}DEPEND but requires roughly double disk and memory.
app-portage/eix:doc - Create description of the eix cache file additionally in html format
-app-portage/eix:jumbo-build - Compile faster and produce better binary. Recommended unless compiling on a quite memory-restricted system.
-app-portage/eix:meson - Build with meson instead of autotools. Faster but less compatible
app-portage/eix:optimization - Accept upstream's choices for CXXFLAGS/LDFLAGS for optimization. Absense of this USE flag does not strip user's *FLAGS
-app-portage/eix:protobuf - Use dev-libs/protobuf to suport proto output with --proto
-app-portage/eix:required-use - Make REQUIRED_USE=true the default which enables support for REQUIRED_USE but requires more disk and memory.
app-portage/eix:security - This adds some checks which can prevent certain exploits if e.g. the eix code has a bug. If you use the hardened toolchain, using this flag does not increase security and can even lead to problems.
app-portage/eix:sqlite - Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix
-app-portage/eix:src-uri - Make SRC_URI=true the default which enables support for SRC_URI but requires roughly double disk and memory.
app-portage/eix:strong-optimization - Adds several more agressive CXXFLAGS/LDFLAGS for optimization like graphite (if available). May cause trouble with some buggy compiler versions. Absense of this USE flag does not strip user's *FLAGS
app-portage/eix:strong-security - Add many checks to prevent exploits if eix code has a bug. This will slow down eix considerably. Use only if you are paranoid or have reasons to suspect a bug.
app-portage/eix:swap-remote - Swap role of remote addresses in eix-remote, making the data from gpo.zugaina.org the first choice.
app-portage/eix:tools - Create separate binary for script helper tools; useful if they are called extremely often
-app-portage/eix:usr-portage - Set last PORTDIR fallback to /usr/portage instead of /var/db/repos/gentoo
-app-portage/portage-bashrc-mv:ccache - Install a script for CCACHE_* variable support. This requires dev-util/ccache
-app-portage/portage-bashrc-mv:cflags - Install a script for /etc/portage/package.cflags support. Requires app-portage/eix for fast parsing
-app-portage/portage-bashrc-mv:remove-la - Install a script to remove unneeded .ls files
-app-portage/portage-bashrc-mv:title - Install a script to display the expected merge time. Requires app-portage/portage-utils and app-shells/runtitle
-app-portage/portage-postsyncd-mv:portage-utils - Make /etc/portage/repo.postsync.d/q-reinit from app-portage/portage-utils non-executable and install a hack in /etc/portage/env/app-portage/portage-utils so that it stays so
app-shells/auto-fu-zsh:compile - Byte-compile to speed up. Do not use this if you are cross-compiling
-app-shells/dash:vanilla - Let echo escapes and -n work as decided by upstream
-app-shells/schily-tools:renameschily_calc - Rename calc to scalc for compatibility with sci-mathematics/calc
-app-shells/schily-tools:renameschily_compare - Rename compare to scompare for compatibility with imagemagick
-app-shells/schily-tools:renameschily_count - Rename count to scount for compatibility with sys-devel/llvm
-app-shells/schily-tools:renameschily_getopt - Rename count to scount for compatibility with sys-devel/llvm
-app-shells/schily-tools:renameschily_jsh - Rename jsh to sjsh for compatibility with app-shells/heirloom-sh
-app-shells/schily-tools:renameschily_libschily - Rename some manpages from libschily for compatibility with sys-apps/man
-app-shells/schily-tools:renameschily_man2html - Rename man2html to sman2html for compatibility with sys-apps/man
-app-shells/schily-tools:renameschily_p - Rename p to sp for compatibility with dev-util/wiggle
-app-shells/schily-tools:schilytools_bosh - Install bosh, a shell which aims to be fully POSIX compatible
-app-shells/schily-tools:schilytools_calc - Install calc, a bc clone
-app-shells/schily-tools:schilytools_calltree - Install calltree, a cflow clone
-app-shells/schily-tools:schilytools_cdrtools - Install programs provided by app-cdr/cdrtools
-app-shells/schily-tools:schilytools_change - Install change, a program to change patterns in files
-app-shells/schily-tools:schilytools_compare - Install compare, a cmp clone
-app-shells/schily-tools:schilytools_copy - Install copy, a cp clone
-app-shells/schily-tools:schilytools_count - Install count, a wc clone
-app-shells/schily-tools:schilytools_cpp - Install cpp, a C preprocessor
-app-shells/schily-tools:schilytools_cstyle - Install Cstyle, a C-codingstyle lint
-app-shells/schily-tools:schilytools_cut - Install scut, a cut clone
-app-shells/schily-tools:schilytools_hdump - Install hdump, a hexdump clone
-app-shells/schily-tools:schilytools_label - Install label, a sun disk label manipulator
-app-shells/schily-tools:schilytools_lndir - Install lndir, a program for creating symlinked directory trees
-app-shells/schily-tools:schilytools_man2html - Install a man2html clone
-app-shells/schily-tools:schilytools_manmake - Install manpages about the schily makefile system
-app-shells/schily-tools:schilytools_match - Install match, a grep clone
-app-shells/schily-tools:schilytools_mdigest - Install mdigest, e.g. covering md5sum sha*sum
-app-shells/schily-tools:schilytools_mountcd - Install mountcd, a solaris CD comparison tool
-app-shells/schily-tools:schilytools_obosh - Install obosh (formerly: osh), the original sVr4 (SunOS 5) shell with original bugs
-app-shells/schily-tools:schilytools_p - Install p, a more program which filters non-printable characters
-app-shells/schily-tools:schilytools_paste - Install spaste, a paste clone
-app-shells/schily-tools:schilytools_patch - Install spatch, a patch clone
-app-shells/schily-tools:schilytools_pbosh - Install pbosh, a shell which implements all POSIX features but only those (compatbilitiy testing!)
-app-shells/schily-tools:schilytools_pxupgrade - Install pxupgrade: upgrading firmware in Plextor CD/DVD writers
-app-shells/schily-tools:schilytools_sccs - Install sfind, a source code control system
-app-shells/schily-tools:schilytools_sfind - Install sfind, a find clone
-app-shells/schily-tools:schilytools_smake - Install smake, a make clone
-app-shells/schily-tools:schilytools_star - Install programs provided by app-arch/star
-app-shells/schily-tools:schilytools_termcap - Install termcap, a termcap compiler
-app-shells/schily-tools:schilytools_translit - Install translit, a tr clone
-app-shells/schily-tools:schilytools_udiff - Install udiff, a diff clone
-app-shells/schily-tools:schilytools_ved - Install ved, a visual editor with features from vi and emacs
-app-shells/schily-tools:suid - Install rscsi as SUID root
app-shells/termcolors-mv:create - Install DIR_COLORS-create perl script
app-shells/termcolors-mv:perl - Install 256colors perl script
-app-shells/termcolors-mv:poor - Install poor man's variant which does not require coreutils-8.25 or newer
-app-text/ispell:tinfo - Whether to support (and require) sys-libs/ncurses[tinfo].
-app-text/lesspipe:antiword - Support doc files with app-text/antiword; this overrides catdoc
-app-text/lesspipe:brotli - Support brotli files; requires app-arch/brotli
-app-text/lesspipe:cabextract - Support cabextract files
-app-text/lesspipe:catdoc - Support doc files with app-text/catdoc; unused if antiword is set
-app-text/lesspipe:cpio - Support cpio files
-app-text/lesspipe:djvu - Support djvu files
-app-text/lesspipe:dpkg - Support Debian package files
-app-text/lesspipe:dvi2tty - Support dvi files with dev-tex/dvi2tty
-app-text/lesspipe:elinks - Support html files with www-client/elinks; ignored if html2text, links, or lynx is set; this overrides w3m
-app-text/lesspipe:fastjar - Support jar files with app-arch/fastjar
-app-text/lesspipe:ghostscript - Support ps files with app-text/ghostscript-gpl; ignored if pstotext is set
-app-text/lesspipe:gpg - Support gpg files
-app-text/lesspipe:groff - Support man and nroff files
-app-text/lesspipe:hdf5 - Support h5dump from sci-libs/hdf5
-app-text/lesspipe:html2text - Support html files with app-text/html2text; this overrides links, lynx, elinks, w3m
-app-text/lesspipe:id3v2 - Support mp3 files with media-sound/id3v2; this overrides mp3info2, mp3info
-app-text/lesspipe:image - Support image/jpg files
-app-text/lesspipe:isoinfo - Support CD/DVD-iso files
-app-text/lesspipe:libplist - Support Apple Property List files
-app-text/lesspipe:libreoffice - Support msword and rtf conversion using app-office/libreoffice
-app-text/lesspipe:links - Support html files with www-client/links; ignored if html2text is set; this overrides lynx, elinks, w3m
-app-text/lesspipe:lynx - Support html files with www-client/lynx; ignored if html2text or links is set; this overrides elinks, w3m
-app-text/lesspipe:lz4 - Support lz4 files; requires app-arch/lz4
-app-text/lesspipe:lzip - Support lzip files
-app-text/lesspipe:mediainfo - Support media display using media-video/mediainfo
-app-text/lesspipe:mp3info - Support mp3 files with media-sound/mp3info; unused if id3v2 or mp3info2 is set
-app-text/lesspipe:mp3info2 - Support mp3 files with dev-perl/MP3-Tag (mp3info2); ignored if id3v2 is set; this overrides mp3info
-app-text/lesspipe:netcdf - Support ncdump from sci-libs/netcdf
-app-text/lesspipe:ooffice - Support OpenOffice files
-app-text/lesspipe:p7zip - Support p7zip files
-app-text/lesspipe:pandoc - Support msword and rtf conversion using app-text/pandoc
-app-text/lesspipe:pdf - Support pdf files
-app-text/lesspipe:pstotext - Support ps files with app-text/pstotext; this overrides ghostscript
-app-text/lesspipe:rar - Support rar files with app-arch/rar; unused if unrar is set
-app-text/lesspipe:rpm - Support rpm files with app-arch/rpm or rpm5; ignored if rpm2targz is set
-app-text/lesspipe:rpm2targz - Support rpm files with app-arch/rpm2targz; this overrides rpm
-app-text/lesspipe:unrar - Support rar files with app-arch/unrar; this overrides rar
-app-text/lesspipe:unrtf - Support rtf files with app-text/unrtf
-app-text/lesspipe:unzip - Support zip files with app-arch/unzip
-app-text/lesspipe:w3m - Support html files with www-client/w3m; ignored if html2text, links, lynx, or elinks is set
-app-text/lesspipe:wv - Support msword and rtf conversion using app-text/wv
-app-text/lesspipe:xlhtml - Support Excel and Powerpoint files with app-arch/xlhtml
-app-text/lesspipe:zstd - Support brotli files; requires app-arch/zstd
-app-text/stardict:advertisement - Enable stardict advertisements plugin
-app-text/stardict:cal - Enable calendar support using cal program
-app-text/stardict:canberra - Use libcanberra for sound playing
-app-text/stardict:dictdotcn - Enable dict.cn network plugin (for Chinese language)
-app-text/stardict:espeak - Enable text to speech synthesizer plugin using app-accessibility/espeak engine
-app-text/stardict:flite - Enable text to speech synthesizer plugin using app-accessibility/flite engine
-app-text/stardict:fortune - Enable plugin to read fortune messages using games-misc/fortune-mod. You may consider installing games-misc/fortune-mod-all to get all fortune messages.
-app-text/stardict:gucharmap - Enable plugin for unicode symbols description using gnome-extra/gucharmap
-app-text/stardict:htmlparse - Enable plugin to parse dictionaries with html content
-app-text/stardict:info - Enable plugin to read info pages
-app-text/stardict:man - Enable plugin to read manual pages
-app-text/stardict:powerwordparse - Enable plugin to parse powerword dictionaries
+app-shells/zsh:compile - Byte-compile. This costs disk space and may make things faster or slower. Do not use this if you are cross-compiling
+app-shells/zsh:completion_AIX - Install zsh completions for AIX
+app-shells/zsh:completion_BSD - Install zsh completions for BSD
+app-shells/zsh:completion_Cygwin - Install zsh completions for Cygwin
+app-shells/zsh:completion_Darwin - Install zsh completions for Darwin
+app-shells/zsh:completion_Debian - Install zsh completions for Debian
+app-shells/zsh:completion_Linux - Install zsh completions for Linux
+app-shells/zsh:completion_Mandriva - Install zsh completions for Mandriva
+app-shells/zsh:completion_Redhat - Install zsh completions for Redhat
+app-shells/zsh:completion_Solaris - Install zsh completions for Solaris
+app-shells/zsh:completion_Unix - Install zsh completions for Unix
+app-shells/zsh:completion_X - Install zsh completions for X
+app-shells/zsh:completion_openSUSE - Install zsh completions for openSUSE
+app-shells/zsh-completions:completion_Android - Install zsh completions for Android-related programs
+app-shells/zsh-completions:completion_Google - Install zsh completions for googlecl
+app-shells/zsh-completions:completion_Unix - Install zsh completion for unix system tools
+app-shells/zsh-completions:completion_database - Install zsh completions for database programs
+app-shells/zsh-completions:completion_dev - Install zsh completions for development (build systems, editors, web)
+app-shells/zsh-completions:completion_disk - Install zsh completions for disk tools
+app-shells/zsh-completions:completion_distribute - Install zsh completions for tools for distributing tasks to machines
+app-shells/zsh-completions:completion_filesystem - Install zsh completions for filesystem tools
+app-shells/zsh-completions:completion_git - Install zsh completions for special git tools
+app-shells/zsh-completions:completion_hardware - Install zsh completions for low-level hardware tools
+app-shells/zsh-completions:completion_haskell - Install zsh completions for Haskell tools
+app-shells/zsh-completions:completion_managers - Install zsh completions for package managers (not portage)
+app-shells/zsh-completions:completion_multimedia - Install zsh completions for multimedia programs
+app-shells/zsh-completions:completion_net - Install zsh completions for net-related tools
+app-shells/zsh-completions:completion_nfs - Install zsh completions for network filesystem tools
+app-shells/zsh-completions:completion_perl - Install zsh completion for perl-related tools
+app-shells/zsh-completions:completion_pip - Install zsh completion for dev-python/pip (instead of completion of dev-python/pip project)
+app-shells/zsh-completions:completion_python - Install zsh completion for python development tools
+app-shells/zsh-completions:completion_ruby - Install zsh completion for ruby tools and tools in ruby
+app-shells/zsh-completions:completion_search - Install zsh completion for search tools like sys-apps/ack and sys-apps/the_silver_searcher
+app-shells/zsh-completions:completion_session - Install zsh completion for session-handling frontends
+app-shells/zsh-completions:completion_subtitles - Install zsh completion for subtitle tools
+app-shells/zsh-completions:completion_virtualization - Install zsh completion for virtualization programs
+app-shells/zsh-completions:completion_web - Install zsh completion for web-related tools incl. java/javascript/scala
+app-text/stardict:espeak - Enable text to speech synthesizer using espeak engine
+app-text/stardict:gnome2 - Enable deprecated gnome2 support
+app-text/stardict:gucharmap - Enable gucharmap dictionary plugin
app-text/stardict:pronounce - Install WyabdcRealPeopleTTS package (it is just many .wav files) to make StarDict pronounce English words
app-text/stardict:qqwry - Enable QQWry plugin, which provides information (in Chinese language) about geographical positions, owner, etc. for IP addresses
-app-text/stardict:tools - Build and install dictionary management tools and converters from various dictionary formats
-app-text/stardict:updateinfo - Enable plugin to check for stardict updates
-app-text/stardict:wikiparse - Enable plugin to parse dictionaries in wikimedia format
-app-text/stardict:wordnet - Enable wordnet plugin to find similar English words using lexical database
-app-text/stardict:xdxfparse - Enable plugin to parse dictionaries in xdxf (XML Dictionary eXchange Format)
-app-text/stardict:youdaodict - Enable youdao.com network plugin (for Chinese language)
-dev-libs/weston:colord - Allow setting color managment
-dev-libs/weston:drm - Enable drm compositor support
-dev-libs/weston:editor - Install wayland-editor example application
-dev-libs/weston:fbdev - Enable fbdev compositor support
-dev-libs/weston:gles2 - Use GLESv2 cairo instead of full GL
-dev-libs/weston:headless - Headless backend and a noop renderer, mainly for testing purposes
-dev-libs/weston:ivi - Enable the IVI shell
-dev-libs/weston:launch - Install weston-launch utility
-dev-libs/weston:rdp - Enable Remote Desktop Protocol compositor support
-dev-libs/weston:resize-optimization - Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi
-dev-libs/weston:screen-sharing - Enable screen-sharing through RDP
-dev-libs/weston:unwind - Enable libunwind usage for backtraces
-dev-libs/weston:wayland-compositor - Enable Wayland compositor support
-dev-libs/weston:webp - Add support for the WebP image format
-dev-libs/weston:xwayland - Enable ability support native X11 applications
-games-board/chessproblem:debug - Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.
-games-board/chessproblem:multithreading - Install multithreading version
-games-board/chessproblem:optimization - Accept upstream's choices for CXXFLAGS/LDFLAGS for optimization. Absense of this USE flag does not strip user's *FLAGS
-games-board/chessproblem:propagate-signal - Use signal propagation for thread pruning. Requires more memory; it is faster in some cases, but slower in others
-games-board/chessproblem:strong-optimization - Adds several more agressive CXXFLAGS/LDFLAGS for optimization like graphite (if available). May cause trouble with some buggy compiler versions. Absense of this USE flag does not strip user's *FLAGS
-games-board/chessproblem:unlimited - Do not limit number of threads by hardware_concurrency. Useful only for debugging
-games-emulation/sdlmame:arcade - Enable the Multiple Arcade Machine Emulator for arcade games support
-games-emulation/sdlmame:mess - Enable the Multi Emulator Super System for game system support
-games-emulation/sdlmame:tools - Build development tools shared between sdlmame and sdlmess
-games-emulation/xmame:bundled-libs - Use bundled version of dev-libs/expat
-games-emulation/xmame:net - Add network support
-games-emulation/xmess:bundled-libs - Use bundled version of dev-libs/expat
-games-emulation/xmess:net - Add network support
-games-rpg/freedroidrpg:devtools - Compile the additional dev tools
-games-rpg/freedroidrpg:profile - Enable the integration of the ingame real-time profiler
-games-rpg/freedroidrpg:sanitize - Compile with address sanitizer
+app-text/stardict:tools - Build and install the extra stardict tools
games-rpg/m5figur-mv:examples - Compile example character sheet as PDF
-media-gfx/pqiv:archive - Enable support for images in archives and cbX comic book files
+games-rpg/magus:acroread - Depend on acroread (otherwise you are responsible to install/configure a pdf viewer)
+games-rpg/magus:imagemagick - Use convert from graphicsmagick/imagemagick to scale pictures before installation
+games-rpg/magus:konqueror - Depend on konqueror browser instead of firefox
+games-rpg/magus:pngcrush - Use pngcrush for opimizing png before installation
+games-rpg/magus:postgres - Use postgresql instead of sqlite
+games-rpg/magus:seamonkey - Depend on seamonkey browser instead of firefox
media-gfx/pqiv:gtk2 - Use gtk:2 instead of gtk:3
-media-libs/avidemux-core:nvenc - Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.
-media-libs/avidemux-core:system-ffmpeg - Use the ffmpeg provided by the system.
-media-libs/avidemux-plugins:aften - Enable A/52 (AC-3) audio encoder support.
-media-libs/avidemux-plugins:amr - Enable Adaptive Multi-Rate format support via media-libs/opencore-amr.
-media-libs/avidemux-plugins:dcaenc - Enable DTS Coherent Acoustics audio encoder support via media-sound/dcaenc.
-media-libs/avidemux-plugins:fdk - Adds support for encoding AAC using media-libs/fdk-aac.
-media-libs/avidemux-plugins:fribidi - Enable unicode bidirectional algorithm support via dev-libs/fribidi.
-media-libs/avidemux-plugins:nvenc - Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.
-media-libs/avidemux-plugins:opus - Adds support for the Opus codec via media-libs/opus.
-media-libs/avidemux-plugins:twolame - Enable TwoLAME support via media-sound/twolame, an optimised MPEG Audio Layer 2 (MP2) encoder.
-media-libs/avidemux-plugins:vpx - Enable WebM VP8 Codec SDK support via media-libs/libvpx.
-media-libs/avidemux-plugins:x265 - Enables HEVC support with media-libs/x265.
media-tv/sundtek-tv:ld-preload-env - Install LD_PRELOAD in /etc/env.d/50sundtek-tv
media-tv/sundtek-tv:ld-preload-file - Install /etc/ld.so.preload
media-tv/sundtek-tv:pax_kernel - Mark package which is necessary if you use a PAX kernel
-media-tv/w_scan:plp-id-zero - Apply experimental patch to force plp_id to 0 for DVB-T2. Seems to be necessary at least with some tuners in some regions
-media-video/avidemux:nvenc - Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.
-media-video/handbrake:fdk - Support for encoding AAC using media-libs/fdk-aac.
-media-video/handbrake:gstreamer - Support for the streaming media framework from media-libs/gstreamer.
-media-video/handbrake:gtk - Install the GTK UI, ghb.
-media-video/handbrake:libav-aac - Support for encoding AAC using libav's internal encoder.
-media-video/handbrake:numa - Adds support for x265's NUMA capabilities.
-media-video/handbrake:nvenc - Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.
-media-video/handbrake:x265 - Support for encoding h265 using media-libs/x265.
-net-dns/noip-updater:ezipupd - Use user/group ezipupd instead of nobody: Useful if you restrict outgoing network traffic for user nobody
-net-print/foo2zjs:foomaticdb - Add support for the foomatic printing driver database
-sci-geosciences/googleearth:bundled-libs - Use bundled libraries.
-sci-geosciences/googleearth:bundled-qt - Use bundled qt.
+net-misc/sshstart:keychain - Pull in keychain as dependency. Not required, but recommended for smoother operation.
sys-apps/less:less-select - Add the less-select feature (additional options and a binary helper).
-sys-apps/less:lesspipe - Default to lesspipe.sh from app-text/lesspipe instead of the gentoo specific lesspipe.
+sys-apps/less:lesspipe - Use sys-apps/lesspipe instead of Gentoo's default lesspipe.sh.
sys-apps/less:original-gentoo - Use the gentoo default for the LESS variable.
sys-apps/less:source - Install sources for keybindings (only useful with less-select).
-sys-apps/man:cache - Use cache directory. Superfluous on modern machines
-sys-block/parted:debug - Enable debugging as encouraged by upstream: [The default configuration] includes --enable-debug (by default), which contains many assertions. Obviously, these "waste" space, but in the past, they have caught potentially dangerous bugs before they would have done damage, so we think it's worth it. Also, it means we get more bug reports ;)
-sys-block/parted:device-mapper - Enable device-mapper support from sys-fs/lvm2 in parted
-sys-block/parted:standalone - Install a standalone version which provides all headers and binaries which collide with sys-block/parted:0. If this flag is not set, sys-block/parted:0 is pulled in to provide the non-installed headers and binaries.
+sys-apps/lesspipe:antiword - Support doc files with app-text/antiword; this overrides catdoc
+sys-apps/lesspipe:cabextract - Support cabextract files
+sys-apps/lesspipe:catdoc - Support doc files with app-text/catdoc; unused if antiword is set
+sys-apps/lesspipe:cpio - Support cpio files
+sys-apps/lesspipe:djvu - Support djvu files
+sys-apps/lesspipe:dpkg - Support Debian package files
+sys-apps/lesspipe:dvi2tty - Support dvi files with dev-tex/dvi2tty
+sys-apps/lesspipe:elinks - Support html files with www-client/elinks; ignored if html2text, links, or lynx is set; this overrides w3m
+sys-apps/lesspipe:fastjar - Support jar files with app-arch/fastjar
+sys-apps/lesspipe:ghostscript - Support ps files with app-text/ghostscript-gpl; ignored if pstotext is set
+sys-apps/lesspipe:gpg - Support gpg files
+sys-apps/lesspipe:groff - Support man and nroff files
+sys-apps/lesspipe:hdf5 - Support h5dump from sci-libs/hdf5
+sys-apps/lesspipe:html2text - Support html files with app-text/html2text; this overrides links, lynx, elinks, w3m
+sys-apps/lesspipe:id3v2 - Support mp3 files with media-sound/id3v2; this overrides mp3info2, mp3info
+sys-apps/lesspipe:image - Support image/jpg files
+sys-apps/lesspipe:isoinfo - Support CD/DVD-iso files
+sys-apps/lesspipe:libplist - Support Apple Property List files
+sys-apps/lesspipe:links - Support html files with www-client/links; ignored if html2text is set; this overrides lynx, elinks, w3m
+sys-apps/lesspipe:lynx - Support html files with www-client/lynx; ignored if html2text or links is set; this overrides elinks, w3m
+sys-apps/lesspipe:lzip - Support lzip files
+sys-apps/lesspipe:mp3info - Support mp3 files with media-sound/mp3info; unused if id3v2 or mp3info2 is set
+sys-apps/lesspipe:mp3info2 - Support mp3 files with dev-perl/MP3-Tag (mp3info2); ignored if id3v2 is set; this overrides mp3info
+sys-apps/lesspipe:netcdf - Support ncdump from sci-libs/netcdf
+sys-apps/lesspipe:ooffice - Support OpenOffice files
+sys-apps/lesspipe:p7zip - Support p7zip files
+sys-apps/lesspipe:pdf - Support pdf files
+sys-apps/lesspipe:pstotext - Support ps files with app-text/pstotext; this overrides ghostscript
+sys-apps/lesspipe:rar - Support rar files with app-arch/rar; unused if unrar is set
+sys-apps/lesspipe:rpm - Support rpm files with app-arch/rpm or rpm5; ignored if rpm2targz is set
+sys-apps/lesspipe:rpm2targz - Support rpm files with app-arch/rpm2targz; this overrides rpm
+sys-apps/lesspipe:unrar - Support rar files with app-arch/unrar; this overrides rar
+sys-apps/lesspipe:unrtf - Support rtf files with app-text/unrtf
+sys-apps/lesspipe:unzip - Support zip files with app-arch/unzip
+sys-apps/lesspipe:w3m - Support html files with www-client/w3m; ignored if html2text, links, lynx, or elinks is set
+sys-apps/lesspipe:xlhtml - Support Excel and Powerpoint files with app-arch/xlhtml
+sys-fs/aufs:all-patches - Apply all patches - also those which do not start with aufs
+sys-fs/aufs:kernel-patch - Apply the aufs kernel patches instead of just copying them
sys-fs/squash_dir:aufs - Prefer aufs
sys-fs/squash_dir:bundled-openrc-wrapper - Install the bundled openrc-wrapper
sys-fs/squash_dir:overlayfs - Prefer overlayfs
sys-fs/squash_dir:unionfs-fuse - Prefer unionfs-fuse
sys-fs/squashfs-tools:lz4 - Enable support for LZ4 compression using app-arch/lz4
sys-fs/squashfs-tools:xz - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils
-sys-fs/squashfs-tools:zstd - Enable support for ZSTD compression using app-arch/zstd (requires >=linux-4.14 or >=sys-fs/squashfuse-0.1.101_alpha20170917)
-sys-fs/squashfuse:lz4 - Enable support for lz4 compression
-sys-fs/squashfuse:zstd - Enable support for zstd compression
-x11-libs/gtk+:adwaita-icon-theme - Force the adwaita-icon-theme
-x11-libs/gtk+:atk-bridge - Enable the gtk3-atk-bridge, hard depending on app-accessibility/at-spi2-atk and thus on sys-apps/dbus
-x11-libs/gtk+:broadway - Enable the GDK Broadway backend.
-x11-libs/gtk+:cloudprint - Enable printing via Google Cloud Print.
-x11-libs/gtk+:colord - Use x11-misc/colord for color management in printing
-x11-libs/motif:motif22-compatibility - Compatibility with Open Motif 2.2
+x11-drivers/nvidia-drivers:kernel3-13 - Install unofficial patches for linux-3.13 and newer
+x11-drivers/nvidia-drivers:kernel3-14 - Install unofficial patches for linux-3.14 and newer
+x11-drivers/nvidia-drivers:kernel3-17 - Install unofficial patches for linux-3.17 and newer
+x11-drivers/nvidia-drivers:pax_kernel - Patch to compile with hardened-sources/grsecurity
+x11-drivers/nvidia-drivers:tools - Install additional tools such as nvidia-settings
diff --git a/repositories.xml b/repositories.xml
deleted file mode 100644
index 5fa12eb7..00000000
--- a/repositories.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE repositories SYSTEM "http://www.gentoo.org/dtd/repositories.dtd">
-<repositories xmlns="" version="1.0">
- <repo quality="experimental" status="unofficial">
- <name>mv</name>
- <description><![CDATA[Ebuilds for packages not in the Gentoo tree
- (lack of maintainer or too experimental) and live ebuilds
- or extensions/bugfixes for packages in the tree]]></description>
- <homepage>https://cgit.gentoo.org/user/mv.git</homepage>
- <owner type="person">
- <email>martin@mvath.de</email>
- <name><![CDATA[Martin Väth]]></name>
- </owner>
- <source type="git">git://anongit.gentoo.org/user/mv.git</source>
- <source type="git">https://anongit.gentoo.org/user/mv.git</source>
- <source type="git">git+ssh://git@git.gentoo.org/user/mv.git</source>
- <feed>https://cgit.gentoo.org/user/mv.git/atom/</feed>
- <!-- <feed>https://gitweb.gentoo.org/user/mv.git/</feed> -->
- <!-- <feed>https://cgit.gentoo.org/user/mv.git/rss/</feed> -->
- </repo>
-</repositories>
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
deleted file mode 100644
index 201593e2..00000000
--- a/sci-geosciences/googleearth/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST google-earth-pro-stable_7.1.8.3036-r0_amd64.deb 45663202 SHA512 6257f8d5e7a178c538e72db7ae7fa4b4242a5b0abb5458f81fa47a3a45c2cb79888c8815e80320b7c1bd071fb021589c3e30d73ebf246027aed6a4e7477739f8
-DIST google-earth-pro-stable_7.1.8.3036-r0_i386.deb 44460270 SHA512 74176fd389bcfb1de681b5c3e51260da8bdae1d62abd520fc457ff2b6161d6a85fa98fb012774019e23b8043c2cf74b6a14bda05f55a25ade945f9fdcdc719c3
-DIST google-earth-pro-stable_7.3.0.3832-r0_amd64.deb 57842874 SHA512 af75d6dc223983aba7f84685c8f12bb06b4972fe0a50a883c5ee3321c37b16cd25ac7c60da3c80f4bf7cec41011827fab9f66ba2c9c3f404cd7270f610815251
-DIST google-earth-pro-stable_7.3.0.3832-r0_i386.deb 56685312 SHA512 7bdf9cdf5d431b55ccc02e15e9f58bb9b3ed6590a6f53afe7202ba2d8fd38be333e9bfe273ea64502a78fb4263021da15b16cf474ea48a3742f0ce622eb8d151
-DIST google-earth-pro-stable_7.3.2_amd64.deb 56455100 SHA512 f17427796d01ea01e5cd8ac357121fff0a72815bb3a01fc9a4a531d3aa49e9850ec54cf59d8c2383e46214861f5f2de9a90fbe157d53dccdb39437e55c006f29
-DIST google-earth-pro-stable_7.3.3_amd64.deb 56057072 SHA512 51f3fd8d3aeaab91a662c4c825f9c1a59fde00a07574441b3b4b29799cfde19c8fb42f348b98480cce7ba28116bf714ebed250fe9029dbd6127dc8f6fec3aa72
diff --git a/sci-geosciences/googleearth/files/googleearth-7-pro-desktopfile.patch b/sci-geosciences/googleearth/files/googleearth-7-pro-desktopfile.patch
deleted file mode 100644
index e5de8c31..00000000
--- a/sci-geosciences/googleearth/files/googleearth-7-pro-desktopfile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- google-earth-pro.desktop
-+++ google-earth-pro.desktop
-@@ -3,10 +3,10 @@
- Name=Google Earth
- GenericName=3D planet viewer
- Comment=Explore, search and discover the planet
--Exec=/opt/google/earth/pro/google-earth-pro %f
-+Exec=/opt/googleearth/googleearth %f
- Terminal=false
--MultipleArgs=false
-+X-MultipleArgs=false
- Icon=google-earth-pro
- Type=Application
--Categories=Application;Network
--MimeType=application/vnd.google-earth.kml+xml;application/vnd.google-earth.kmz;application/earthviewer;application/keyhole
-+Categories=Network;
-+MimeType=application/vnd.google-earth.kml+xml;application/vnd.google-earth.kmz;application/earthviewer;application/keyhole;
diff --git a/sci-geosciences/googleearth/files/googleearth-mimetypes.xml b/sci-geosciences/googleearth/files/googleearth-mimetypes.xml
deleted file mode 100644
index 3ecfa97c..00000000
--- a/sci-geosciences/googleearth/files/googleearth-mimetypes.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
- <mime-type type="application/vnd.google-earth.kml+xml">
- <comment>Keyhole Markup Language data</comment>
- <glob pattern="*.kml"/>
- </mime-type>
-
- <mime-type type="application/vnd.google-earth.kmz">
- <comment>Keyhole Markup Language archive</comment>
- <glob pattern="*.kmz"/>
- </mime-type>
-
- <mime-type type="application/keyhole">
- <comment>Keyhole Markup Language data</comment>
- </mime-type>
-
- <mime-type type="application/earthviewer">
- <comment>Keyhole Markup Language data</comment>
- </mime-type>
-</mime-info>
-
diff --git a/sci-geosciences/googleearth/googleearth-7.1.8.3036-r3.ebuild b/sci-geosciences/googleearth/googleearth-7.1.8.3036-r3.ebuild
deleted file mode 100644
index b02bdfb6..00000000
--- a/sci-geosciences/googleearth/googleearth-7.1.8.3036-r3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Martin V\"ath and others
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils unpacker wrapper xdg-utils
-
-DESCRIPTION="A 3D interface to the planet"
-HOMEPAGE="https://www.google.com/earth/desktop/"
-MY_PV=$(ver_rs 1- _ $(ver_cut 1-3))
-SRC_URI="x86? ( https://dl.google.com/dl/earth/client/GE7/release_${MY_PV}/google-earth-pro-stable_${PV}-r0_i386.deb )
- amd64? ( https://dl.google.com/dl/earth/client/GE7/release_${MY_PV}/google-earth-pro-stable_${PV}-r0_amd64.deb )"
-LICENSE="googleearth GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror splitdebug"
-IUSE="+bundled-libs"
-
-QA_PREBUILT="*"
-
-# TODO: find a way to unbundle libQt
-# ./googleearth-bin: symbol lookup error: ./libbase.so: undefined symbol: _Z34QBasicAtomicInt_fetchAndAddOrderedPVii
-
-RDEPEND="
- dev-libs/glib:2
- dev-libs/nspr
- media-libs/fontconfig
- media-libs/freetype
- net-misc/curl
- sys-devel/gcc[cxx]
- sys-libs/zlib
- virtual/glu
- virtual/opengl
- virtual/ttf-fonts
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXau
- x11-libs/libXdmcp
- !bundled-libs? (
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/nss
- =sci-libs/proj-4.8.0*
- )"
-# sci-libs/gdal-1*
-BDEPEND="dev-util/patchelf"
-
-S=${WORKDIR}/opt/google/earth/pro
-
-src_unpack() {
- # default src_unpack fails with deb2targz installed, also this unpacks the data.tar.lzma as well
- unpack_deb ${A}
-
- if ! use bundled-libs ; then
- einfo "removing bundled libs"
- cd opt/google/earth/pro || die
- # sci-libs/gdal-1*
- # rm -v libgdal.so.1 || die
- # dev-db/sqlite
- rm -v libsqlite3.so || die
- # dev-libs/nss
- rm -v libplc4.so libplds4.so libnspr4.so libnssckbi.so libfreebl3.so \
- libnssdbm3.so libnss3.so libnssutil3.so libsmime3.so libnsssysinit.so \
- libsoftokn3.so libssl3.so || die
- # dev-libs/expat
- rm -v libexpat.so.1 || die
- # sci-libs/proj
- rm -v libproj.so.0 || die
- # dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4
-# rm -v libQt{Core,Gui,Network,WebKit}.so.4 || die
-# rm -rv plugins/imageformats || die
- fi
-}
-
-src_prepare() {
-
- # we have no ld-lsb.so.3 symlink
- # thanks to Nathan Phillip Brink <ohnobinki@ohnopublishing.net> for suggesting patchelf
- einfo "running patchelf"
- patchelf --set-interpreter /$(get_libdir)/ld-linux$(usex amd64 "-x86-64" "").so.2 ${PN}-bin || die "patchelf failed"
-
- # Set RPATH for preserve-libs handling (bug #265372).
- local x
- for x in * ; do
- # Use \x7fELF header to separate ELF executables and libraries
- [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
- chmod u+w "${x}" || die
- patchelf --set-rpath '$ORIGIN' "${x}" || \
- die "patchelf failed on ${x}"
- done
- for x in plugins/*.so ; do
- [[ -f ${x} ]] || continue
- chmod u+w "${x}" || die
- patchelf --set-rpath '$ORIGIN/..' "${x}" || \
- die "patchelf failed on ${x}"
- done
- for x in plugins/imageformats/*.so ; do
- [[ -f ${x} ]] || continue
- chmod u+w "${x}" || die
- patchelf --set-rpath '$ORIGIN/../..' "${x}" || \
- die "patchelf failed on ${x}"
- done
-
- eapply -p0 "${FILESDIR}"/${PN}-${PV%%.*}-pro-desktopfile.patch
- default
-}
-
-src_install() {
- make_wrapper ${PN} ./${PN} /opt/${PN} .
-
- insinto /usr/share/mime/packages
- doins "${FILESDIR}/${PN}-mimetypes.xml" || die
-
- domenu google-earth-pro.desktop
-
- local size
- for size in 16 22 24 32 48 64 128 256 ; do
- newicon -s ${size} product_logo_${size}.png google-earth-pro.png
- done
-
- rm -rf xdg-mime xdg-settings google-earth-pro google-earth-pro.desktop product_logo_*
-
- insinto /opt/${PN}
- doins -r *
-
- chmod +x "${ED}"/opt/${PN}/{${PN}{,-bin},gpsbabel} || die
- find "${ED}" -type f '(' -name '*.so.*' -o -name '*.so' ')' -exec chmod +x '{}' + || die
-
- pax-mark -m "${ED%/}"/opt/${PN}/${PN}-bin
-}
-
-pkg_postinst() {
- elog "When you get a crash starting Google Earth, try adding a file ~./.config/Google/GoogleEarthPlus.conf"
- elog "with the following options:"
- elog "lastTip = 4"
- elog "enableTips = false"
- elog ""
- elog "In addition, the use of free video drivers may cause problems associated with using the Mesa"
- elog "library. In this case, Google Earth 6x likely only works with the Gallium3D variant."
- elog "To select the 32bit graphic library use the command:"
- elog " eselect mesa list"
- elog "For example, for Radeon R300 (x86):"
- elog " eselect mesa set r300 2"
- elog "For Intel Q33 (amd64):"
- elog " eselect mesa set 32bit i965 2"
- elog "You may need to restart X afterwards"
-
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
diff --git a/sci-geosciences/googleearth/googleearth-7.3.0.3832-r3.ebuild b/sci-geosciences/googleearth/googleearth-7.3.0.3832-r3.ebuild
deleted file mode 100644
index 17f37534..00000000
--- a/sci-geosciences/googleearth/googleearth-7.3.0.3832-r3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2020 Martin V\"ath and others
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils unpacker wrapper xdg-utils
-
-DESCRIPTION="A 3D interface to the planet"
-HOMEPAGE="https://www.google.com/earth/desktop/"
-MY_PV=$(ver_rs 1- _ $(ver_cut 1-3))
-SRC_URI="x86? ( https://dl.google.com/dl/earth/client/GE7/release_${MY_PV}/google-earth-pro-stable_${PV}-r0_i386.deb )
- amd64? ( https://dl.google.com/dl/earth/client/GE7/release_${MY_PV}/google-earth-pro-stable_${PV}-r0_amd64.deb )"
-LICENSE="googleearth GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror splitdebug"
-IUSE="+bundled-libs +bundled-qt"
-
-QA_PREBUILT="*"
-
-RDEPEND="
- dev-libs/glib:2
- dev-libs/nspr
- media-libs/fontconfig
- media-libs/freetype
- net-misc/curl
- sys-devel/gcc[cxx]
- sys-libs/zlib
- virtual/glu
- virtual/opengl
- virtual/ttf-fonts
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXau
- x11-libs/libXdmcp
- !bundled-libs? (
- dev-libs/expat
- =sci-libs/proj-4.8.0*
- )
- !bundled-qt? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5[widgets]
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsensors:5
- dev-qt/qtscript:5[scripttools]
- dev-qt/qtwebchannel:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- )"
-# sci-libs/gdal-1*
-BDEPEND="dev-util/patchelf"
-
-S=${WORKDIR}/opt/google/earth/pro
-
-src_unpack() {
- # default src_unpack fails with deb2targz installed, also this unpacks the data.tar.lzma as well
- unpack_deb ${A}
-
- cd opt/google/earth/pro || die
- if ! use bundled-libs ; then
- einfo "removing bundled libs"
- # sci-libs/gdal-1*
- # rm -v libgdal.so.1 || die
- # dev-libs/expat
- rm -v libexpat.so.1 || die
- # sci-libs/proj
- rm -v libproj.so.0 || die
-# rm -rv plugins/imageformats || die
- fi
- if ! use bundled-qt ; then
- einfo "removing bundled qt"
- rm -v libQt5{Core,DBus,Gui,Multimedia,MultimediaWidgets,Network,OpenGL,Positioning,PrintSupport,Qml,Quick,Script,ScriptTools,Sensors,Sql,WebChannel,WebKit,WebKitWidgets,Widgets,X11Extras,XcbQpa}.so.5 || die
- fi
-}
-
-src_prepare() {
-
- # we have no ld-lsb.so.3 symlink
- # thanks to Nathan Phillip Brink <ohnobinki@ohnopublishing.net> for suggesting patchelf
- einfo "running patchelf"
- patchelf --set-interpreter /$(get_libdir)/ld-linux$(usex amd64 "-x86-64" "").so.2 ${PN}-bin || die "patchelf failed"
-
- # Set RPATH for preserve-libs handling (bug #265372).
- local x
- for x in * ; do
- # Use \x7fELF header to separate ELF executables and libraries
- [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
- chmod u+w "${x}" || die
- patchelf --set-rpath '$ORIGIN' "${x}" || \
- die "patchelf failed on ${x}"
- done
- for x in plugins/*.so ; do
- [[ -f ${x} ]] || continue
- chmod u+w "${x}" || die
- patchelf --set-rpath '$ORIGIN/..' "${x}" || \
- die "patchelf failed on ${x}"
- done
- for x in plugins/imageformats/*.so ; do
- [[ -f ${x} ]] || continue
- chmod u+w "${x}" || die
- patchelf --set-rpath '$ORIGIN/../..' "${x}" || \
- die "patchelf failed on ${x}"
- done
-
- eapply -p0 "${FILESDIR}"/${PN}-${PV%%.*}-pro-desktopfile.patch
- default
-}
-
-src_install() {
- make_wrapper ${PN} ./${PN} /opt/${PN} .
-
- insinto /usr/share/mime/packages
- doins "${FILESDIR}/${PN}-mimetypes.xml" || die
-
- domenu google-earth-pro.desktop
-
- local size
- for size in 16 22 24 32 48 64 128 256 ; do
- newicon -s ${size} product_logo_${size}.png google-earth-pro.png
- done
-
- rm -rf xdg-mime xdg-settings google-earth-pro google-earth-pro.desktop product_logo_*
-
- insinto /opt/${PN}
- doins -r *
-
- chmod +x "${ED}"/opt/${PN}/{${PN}{,-bin},repair_tool,gpsbabel} || die
- find "${ED}" -type f '(' -name '*.so.*' -o -name '*.so' ')' -exec chmod +x '{}' + || die
-
- pax-mark -m "${ED%/}"/opt/${PN}/${PN}-bin
-}
-
-pkg_postinst() {
- elog "When you get a crash starting Google Earth, try adding a file ~./.config/Google/GoogleEarthPlus.conf"
- elog "with the following options:"
- elog "lastTip = 4"
- elog "enableTips = false"
- elog ""
- elog "In addition, the use of free video drivers may cause problems associated with using the Mesa"
- elog "library. In this case, Google Earth 6x likely only works with the Gallium3D variant."
- elog "To select the 32bit graphic library use the command:"
- elog " eselect mesa list"
- elog "For example, for Radeon R300 (x86):"
- elog " eselect mesa set r300 2"
- elog "For Intel Q33 (amd64):"
- elog " eselect mesa set 32bit i965 2"
- elog "You may need to restart X afterwards"
-
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
diff --git a/sci-geosciences/googleearth/googleearth-7.3.2.ebuild b/sci-geosciences/googleearth/googleearth-7.3.2.ebuild
deleted file mode 100644
index 0f7b42d4..00000000
--- a/sci-geosciences/googleearth/googleearth-7.3.2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Martin V\"ath and others
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils unpacker wrapper xdg-utils
-
-DESCRIPTION="A 3D interface to the planet"
-HOMEPAGE="https://www.google.com/earth/desktop/"
-SRC_URI="https://dl.google.com/dl/linux/direct/google-earth-pro-stable_${PV}_amd64.deb"
-LICENSE="googleearth GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror splitdebug"
-IUSE="+bundled-qt"
-
-QA_PREBUILT="*"
-
-RDEPEND="
- dev-libs/glib:2
- dev-libs/nspr
- media-libs/fontconfig
- media-libs/freetype
- media-libs/gstreamer:1.0=
- media-libs/gst-plugins-base:1.0=
- net-libs/libproxy
- net-misc/curl
- sys-devel/gcc[cxx]
- sys-libs/zlib
- virtual/glu
- virtual/opengl
- virtual/ttf-fonts
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXau
- x11-libs/libXdmcp
- !bundled-qt? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5[widgets]
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsensors:5
- dev-qt/qtscript:5[scripttools]
- dev-qt/qtwebchannel:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- )"
-# sci-libs/gdal-1*
-BDEPEND="dev-util/patchelf"
-
-S=${WORKDIR}/opt/google/earth/pro
-
-src_unpack() {
- # default src_unpack fails with deb2targz installed, also this unpacks the data.tar.lzma as well
- unpack_deb ${A}
-
- cd opt/google/earth/pro || die
- if ! use bundled-qt ; then
- einfo "removing bundled qt"
- rm -v libQt5{Core,DBus,Gui,Multimedia,MultimediaWidgets,Network,OpenGL,Positioning,PrintSupport,Qml,Quick,Script,ScriptTools,Sensors,Sql,WebChannel,WebKit,WebKitWidgets,Widgets,X11Extras,XcbQpa}.so.5 || die
- fi
-}
-
-src_prepare() {
-
- # we have no ld-lsb.so.3 symlink
- # thanks to Nathan Phillip Brink <ohnobinki@ohnopublishing.net> for suggesting patchelf
- einfo "running patchelf"
- patchelf --set-interpreter /$(get_libdir)/ld-linux$(usex amd64 "-x86-64" "").so.2 ${PN}-bin || die "patchelf failed"
-
- # Set RPATH for preserve-libs handling (bug #265372).
- local x
- for x in * ; do
- # Use \x7fELF header to separate ELF executables and libraries
- [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
- chmod u+w "${x}" || die
- patchelf --set-rpath '$ORIGIN' "${x}" || \
- die "patchelf failed on ${x}"
- done
- for x in plugins/*.so ; do
- [[ -f ${x} ]] || continue
- chmod u+w "${x}" || die
- patchelf --set-rpath '$ORIGIN/..' "${x}" || \
- die "patchelf failed on ${x}"
- done
- for x in plugins/imageformats/*.so ; do
- [[ -f ${x} ]] || continue
- chmod u+w "${x}" || die
- patchelf --set-rpath '$ORIGIN/../..' "${x}" || \
- die "patchelf failed on ${x}"
- done
-
- eapply -p0 "${FILESDIR}"/${PN}-${PV%%.*}-pro-desktopfile.patch
- default
-}
-
-src_install() {
- make_wrapper ${PN} ./${PN} /opt/${PN} .
-
- insinto /usr/share/mime/packages
- doins "${FILESDIR}/${PN}-mimetypes.xml" || die
-
- domenu google-earth-pro.desktop
-
- local size
- for size in 16 22 24 32 48 64 128 256 ; do
- newicon -s ${size} product_logo_${size}.png google-earth-pro.png
- done
-
- rm -rf xdg-mime xdg-settings google-earth-pro google-earth-pro.desktop product_logo_*
-
- insinto /opt/${PN}
- doins -r *
-
- chmod +x "${ED}"/opt/${PN}/{${PN}{,-bin},repair_tool,gpsbabel} || die
- find "${ED}" -type f '(' -name '*.so.*' -o -name '*.so' ')' -exec chmod +x '{}' + || die
-
- pax-mark -m "${ED%/}"/opt/${PN}/${PN}-bin
-}
-
-pkg_postinst() {
- elog "When you get a crash starting Google Earth, try adding a file ~./.config/Google/GoogleEarthPlus.conf"
- elog "with the following options:"
- elog "lastTip = 4"
- elog "enableTips = false"
- elog ""
- elog "In addition, the use of free video drivers may cause problems associated with using the Mesa"
- elog "library. In this case, Google Earth 6x likely only works with the Gallium3D variant."
- elog "To select the 32bit graphic library use the command:"
- elog " eselect mesa list"
- elog "For example, for Radeon R300 (x86):"
- elog " eselect mesa set r300 2"
- elog "For Intel Q33 (amd64):"
- elog " eselect mesa set 32bit i965 2"
- elog "You may need to restart X afterwards"
-
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
diff --git a/sci-geosciences/googleearth/googleearth-7.3.3.ebuild b/sci-geosciences/googleearth/googleearth-7.3.3.ebuild
deleted file mode 100644
index 0f7b42d4..00000000
--- a/sci-geosciences/googleearth/googleearth-7.3.3.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Martin V\"ath and others
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils unpacker wrapper xdg-utils
-
-DESCRIPTION="A 3D interface to the planet"
-HOMEPAGE="https://www.google.com/earth/desktop/"
-SRC_URI="https://dl.google.com/dl/linux/direct/google-earth-pro-stable_${PV}_amd64.deb"
-LICENSE="googleearth GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror splitdebug"
-IUSE="+bundled-qt"
-
-QA_PREBUILT="*"
-
-RDEPEND="
- dev-libs/glib:2
- dev-libs/nspr
- media-libs/fontconfig
- media-libs/freetype
- media-libs/gstreamer:1.0=
- media-libs/gst-plugins-base:1.0=
- net-libs/libproxy
- net-misc/curl
- sys-devel/gcc[cxx]
- sys-libs/zlib
- virtual/glu
- virtual/opengl
- virtual/ttf-fonts
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXau
- x11-libs/libXdmcp
- !bundled-qt? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5[widgets]
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsensors:5
- dev-qt/qtscript:5[scripttools]
- dev-qt/qtwebchannel:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- )"
-# sci-libs/gdal-1*
-BDEPEND="dev-util/patchelf"
-
-S=${WORKDIR}/opt/google/earth/pro
-
-src_unpack() {
- # default src_unpack fails with deb2targz installed, also this unpacks the data.tar.lzma as well
- unpack_deb ${A}
-
- cd opt/google/earth/pro || die
- if ! use bundled-qt ; then
- einfo "removing bundled qt"
- rm -v libQt5{Core,DBus,Gui,Multimedia,MultimediaWidgets,Network,OpenGL,Positioning,PrintSupport,Qml,Quick,Script,ScriptTools,Sensors,Sql,WebChannel,WebKit,WebKitWidgets,Widgets,X11Extras,XcbQpa}.so.5 || die
- fi
-}
-
-src_prepare() {
-
- # we have no ld-lsb.so.3 symlink
- # thanks to Nathan Phillip Brink <ohnobinki@ohnopublishing.net> for suggesting patchelf
- einfo "running patchelf"
- patchelf --set-interpreter /$(get_libdir)/ld-linux$(usex amd64 "-x86-64" "").so.2 ${PN}-bin || die "patchelf failed"
-
- # Set RPATH for preserve-libs handling (bug #265372).
- local x
- for x in * ; do
- # Use \x7fELF header to separate ELF executables and libraries
- [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
- chmod u+w "${x}" || die
- patchelf --set-rpath '$ORIGIN' "${x}" || \
- die "patchelf failed on ${x}"
- done
- for x in plugins/*.so ; do
- [[ -f ${x} ]] || continue
- chmod u+w "${x}" || die
- patchelf --set-rpath '$ORIGIN/..' "${x}" || \
- die "patchelf failed on ${x}"
- done
- for x in plugins/imageformats/*.so ; do
- [[ -f ${x} ]] || continue
- chmod u+w "${x}" || die
- patchelf --set-rpath '$ORIGIN/../..' "${x}" || \
- die "patchelf failed on ${x}"
- done
-
- eapply -p0 "${FILESDIR}"/${PN}-${PV%%.*}-pro-desktopfile.patch
- default
-}
-
-src_install() {
- make_wrapper ${PN} ./${PN} /opt/${PN} .
-
- insinto /usr/share/mime/packages
- doins "${FILESDIR}/${PN}-mimetypes.xml" || die
-
- domenu google-earth-pro.desktop
-
- local size
- for size in 16 22 24 32 48 64 128 256 ; do
- newicon -s ${size} product_logo_${size}.png google-earth-pro.png
- done
-
- rm -rf xdg-mime xdg-settings google-earth-pro google-earth-pro.desktop product_logo_*
-
- insinto /opt/${PN}
- doins -r *
-
- chmod +x "${ED}"/opt/${PN}/{${PN}{,-bin},repair_tool,gpsbabel} || die
- find "${ED}" -type f '(' -name '*.so.*' -o -name '*.so' ')' -exec chmod +x '{}' + || die
-
- pax-mark -m "${ED%/}"/opt/${PN}/${PN}-bin
-}
-
-pkg_postinst() {
- elog "When you get a crash starting Google Earth, try adding a file ~./.config/Google/GoogleEarthPlus.conf"
- elog "with the following options:"
- elog "lastTip = 4"
- elog "enableTips = false"
- elog ""
- elog "In addition, the use of free video drivers may cause problems associated with using the Mesa"
- elog "library. In this case, Google Earth 6x likely only works with the Gallium3D variant."
- elog "To select the 32bit graphic library use the command:"
- elog " eselect mesa list"
- elog "For example, for Radeon R300 (x86):"
- elog " eselect mesa set r300 2"
- elog "For Intel Q33 (amd64):"
- elog " eselect mesa set 32bit i965 2"
- elog "You may need to restart X afterwards"
-
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- xdg_icon_cache_update
-}
diff --git a/sci-geosciences/googleearth/metadata.xml b/sci-geosciences/googleearth/metadata.xml
deleted file mode 100644
index dc031f82..00000000
--- a/sci-geosciences/googleearth/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <use>
- <flag name="bundled-libs">Use bundled libraries.</flag>
- <flag name="bundled-qt">Use bundled qt.</flag>
- </use>
-</pkgmetadata>
diff --git a/sci-mathematics/genius/ChangeLog b/sci-mathematics/genius/ChangeLog
new file mode 100644
index 00000000..50b68da7
--- /dev/null
+++ b/sci-mathematics/genius/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for sci-mathematics/genius
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 26 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+ 31 May 2013; Martin Väth <martin@mvath.de>:
+ Copy from tree to make gnome-doc-utils optional. Clean old ChangeLog
diff --git a/sci-mathematics/genius/Manifest b/sci-mathematics/genius/Manifest
index b346a480..b4116bf5 100644
--- a/sci-mathematics/genius/Manifest
+++ b/sci-mathematics/genius/Manifest
@@ -1,2 +1,2 @@
-DIST genius-1.0.21.tar.xz 2539784 SHA512 d4f5e80e1cc6216d7f460f7de86d232566eeb30fec90b93b2e6ccb8d2d0c14aaadf9b969c9a4f940a036e246f085edd02298c769504b620d2eb97ef2a3a852da
-DIST genius-reference.pdf 483889 SHA512 e1b9b183854766989e1a558c716e0b1b01e9e7ec502b0319f81135aea40077755164dd0e039851b9590d4b5b8ceabcead41688785b318bec804e4cdca5fd0bdb
+DIST genius-1.0.19.tar.xz 2447724 SHA256 e5a979d13ae39fb1ae176078dbb301222e6c7a1c2cda8d999bac3ff6a4a7e6c2 SHA512 84ec48c0e13af088f61674e170c23cbc06e081bea43babe3460b88fd2e256c9fc44b891afa3270d5117ccd91ec6d2c25b022dde3d468635df9d1c6e573c4ef05 WHIRLPOOL 772637bd2c2333a08115397781773b1aa74cb195b9731b1b07ddf689fef47790aad79d2f2a6c7e45fe5c6738eb8bda56e0cebe3802c01cd5c1a99bfb3b00b0d5
+DIST genius-reference.pdf 1024944 SHA256 79011ae33ff781507185898ba76b156699061eda78ed16e15aa02195c896ee4b SHA512 04af3870104d2320b1d4b345d74d713a0dfcdf8a228002506508f437659b3ef6037ead0b1f6b37cc335692150750b58c4007fdaaddd9540233474ccd10dac285 WHIRLPOOL 301302145d43843ddd749ab33612438d360462c9d3daa12d7050d9ca6da82bdea3ef53b917989d0c518327780b147a9f74e407f555a62dcdbe0f0c2ef864fa88
diff --git a/sci-mathematics/genius/genius-1.0.19.ebuild b/sci-mathematics/genius/genius-1.0.19.ebuild
new file mode 100644
index 00000000..49955d39
--- /dev/null
+++ b/sci-mathematics/genius/genius-1.0.19.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils gnome2
+
+DESCRIPTION="Genius Mathematics Tool and the GEL Language"
+HOMEPAGE="http://www.jirka.org/genius.html"
+SRC_URI="
+ mirror://gnome/sources/${PN}/1.0/${P}.tar.xz
+ doc? ( http://www.jirka.org/${PN}-reference.pdf )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gnome nls"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/gmp
+ dev-libs/mpfr
+ dev-libs/popt
+ sys-libs/ncurses
+ sys-libs/readline
+ gnome? (
+ app-text/scrollkeeper
+ app-text/gnome-doc-utils
+ x11-libs/gtk+:2
+ gnome-base/libgnome
+ gnome-base/libgnomeui
+ gnome-base/libglade:2.0
+ x11-libs/gtksourceview:2.0
+ x11-libs/vte:0 )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ || ( sys-devel/bison dev-util/yacc )
+ sys-devel/flex
+ nls? ( sys-devel/gettext )"
+
+src_prepare() {
+ if ! use gnome
+ then sed -i \
+ -e "/GNOME_DOC_INIT/d" \
+ configure.in
+ sed -i \
+ -e '/gnome-doc-utils\.make/d' \
+ help/Makefile.am
+ eautoreconf
+ fi
+ G2CONF="${G2CONF} $(use_enable gnome) $(use_enable nls) \
+ --disable-update-mimedb --disable-scrollkeeper \
+ --disable-extra-gcc-optimization"
+ # gnome2.eclass adds --disable-gtk-doc or --enable-gtk-doc to G2CONF
+ # if there is the USE flag doc, thus leading to QA warnings
+ GCONF_DEBUG="no"
+ DOCS="AUTHORS ChangeLog NEWS README TODO"
+ USE_DESTDIR="1"
+ gnome2_src_prepare
+}
+
+src_install() {
+ use doc && DOCS+=" ${DISTDIR}/${PN}-reference.pdf"
+ gnome2_src_install
+}
diff --git a/sci-mathematics/genius/genius-1.0.21.ebuild b/sci-mathematics/genius/genius-1.0.21.ebuild
deleted file mode 100644
index 0371fc84..00000000
--- a/sci-mathematics/genius/genius-1.0.21.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools gnome2
-
-DESCRIPTION="Genius Mathematics Tool and the GEL Language"
-HOMEPAGE="http://www.jirka.org/genius.html"
-SRC_URI="${SRC_URI}
- doc? ( http://www.jirka.org/${PN}-reference.pdf )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc gnome nls"
-
-RDEPEND="
- dev-libs/glib:2
- dev-libs/gmp:0=
- dev-libs/mpfr:0=
- dev-libs/popt
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- gnome? (
- x11-libs/gtk+:2
- gnome-base/libgnome
- gnome-base/libgnomeui
- gnome-base/libglade:2.0
- x11-libs/gtksourceview:2.0
- x11-libs/vte:0 )
-"
-DEPEND="${RDEPEND}
- gnome? (
- app-text/rarian
- dev-util/gtk-update-icon-cache
- app-text/gnome-doc-utils
- )
- dev-util/intltool
- || ( sys-devel/bison dev-util/yacc )
- sys-devel/flex
- nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
- default
- if ! use gnome
- then sed \
- -e "s/AC_PATH_PROG.\(SCROLLKEEPER_CONFIG\).*/\1=true/" \
- -e "s/AC_PATH_PROG.\(GTK_UPDATE_ICON_CACHE\).*/\1=true/" \
- configure.in >configure.ac
- sed -i \
- -e '/gnome-doc-utils\.make/d' \
- help/Makefile.am
- rm configure.in
- eautoreconf
- fi
-}
-
-src_configure() {
- gnome2_src_configure \
- $(use_enable gnome) \
- $(use_enable nls) \
- $(usex gnome '' --disable-scrollkeeper) \
- $(usex gnome '' --disable-update-mimedb) \
- --disable-extra-gcc-optimization \
- --disable-static
-}
-
-src_install() {
- use doc && DOCS+=" ${DISTDIR}/${PN}-reference.pdf"
- gnome2_src_install
-}
diff --git a/sci-mathematics/genius/metadata.xml b/sci-mathematics/genius/metadata.xml
index cc2f5351..cbdd7f0a 100644
--- a/sci-mathematics/genius/metadata.xml
+++ b/sci-mathematics/genius/metadata.xml
@@ -1,27 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- <description>maintainer of the updates in the mv overlay</description>
-</maintainer>
-<maintainer type="person">
- <email>grozin@gentoo.org</email>
- <name>Andrey Grozin</name>
-</maintainer>
-<maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
-</maintainer>
-<longdescription>Genius is a calculator program which can work
- with arbitrary precision integers, multiple precision floats,
- rational numbers, complex numbers, linear algebra, number theory,
- numerical calculus, statistics, numerical equation solving,
- combinatorics, elementary functions, modular arithmetic.
- It has a programming language with automatic typing.
- It can do various 2D and 3D plots, with possibility
- to export to eps or png. Genius has a GUI IDE.
- It can output matrices in LaTeX, Troff (eqn) or MathML.
-</longdescription>
+ <herd>sci</herd>
+ <maintainer>
+ <email>grozin@gentoo.org</email>
+ <name>Andrey Grozin</name>
+ </maintainer>
+ <longdescription>Genius is a calculator program which can work
+ with arbitrary precision integers, multiple precision floats,
+ rational numbers, complex numbers, linear algebra, number theory,
+ numerical calculus, statistics, numerical equation solving,
+ combinatorics, elementary functions, modular arithmetic.
+ It has a programming language with automatic typing.
+ It can do various 2D and 3D plots, with possibility
+ to export to eps or png. Genius has a GUI IDE.
+ It can output matrices in LaTeX, Troff (eqn) or MathML.
+ </longdescription>
</pkgmetadata>
diff --git a/sci-mathematics/reduce/ChangeLog b/sci-mathematics/reduce/ChangeLog
new file mode 100644
index 00000000..5e132a12
--- /dev/null
+++ b/sci-mathematics/reduce/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for sci-mathematics/reduce
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*reduce-20141130.ebuild (24 Jan 2015)
+
+ 02 Sep 2015; Martin Väth <martin@mvath.de>:
+ Hackish fix of broken scripts/findos.sh
+
+ 24 Jan 2015; Martin Väth <martin@mvath.de>:
+ Copy from gentoo tree to version bump to a snapshot which at least compiles.
+ Adapt URL and $S to snapshot version numbering. Bump EAPI, add epatch_user.
+ Clear previous ChangeLog
diff --git a/sci-mathematics/reduce/Manifest b/sci-mathematics/reduce/Manifest
index 9a9620d9..77447adb 100644
--- a/sci-mathematics/reduce/Manifest
+++ b/sci-mathematics/reduce/Manifest
@@ -1,2 +1 @@
-DIST Reduce-svn4961-src.tar.gz 271949781 SHA512 6bb9e97e0c6187b14f20543dd9285721325179cdb043d23a6491dc8b123d87f6f6d06910cf7d72ba0074c75e8ffa0b603fb5a1ba4f56e7c898bb29e274dbffbf
-DIST reduce-src-2014-11-30.tar.bz2 253343100 SHA512 46dfead80b2778b37ac723343d2922d00a48f4bd5ca7d92c14039abd880cd1b0b3276c660e9ee443cdc6383e42448479893411360bfdbe2a239e11a780d6672b
+DIST reduce-src-2014-11-30.tar.bz2 253343100 SHA256 b15debc944475d4daee1bcbdbaff415693522306785507f2d3110d75df6e7006 SHA512 46dfead80b2778b37ac723343d2922d00a48f4bd5ca7d92c14039abd880cd1b0b3276c660e9ee443cdc6383e42448479893411360bfdbe2a239e11a780d6672b WHIRLPOOL ef020a09dd23794d7363062d96ae18b35d622b27549790b19addc84292fa78fbcb687312dcc7449c9f6844d041a6d5e14430ecf33ce9696495c7d0c0219860c6
diff --git a/sci-mathematics/reduce/files/csl b/sci-mathematics/reduce/files/csl
index 4542b530..895b6bd8 100644..100755
--- a/sci-mathematics/reduce/files/csl
+++ b/sci-mathematics/reduce/files/csl
@@ -1,2 +1,2 @@
#!/bin/sh
-exec /usr/lib/reduce/csl "$@"
+exec /usr/lib/reduce/csl $*
diff --git a/sci-mathematics/reduce/files/redcsl b/sci-mathematics/reduce/files/redcsl
index 2b02b14c..ff40e3e0 100644..100755
--- a/sci-mathematics/reduce/files/redcsl
+++ b/sci-mathematics/reduce/files/redcsl
@@ -1,2 +1,2 @@
#!/bin/sh
-exec /usr/lib/reduce/reduce "$@"
+exec /usr/lib/reduce/reduce $*
diff --git a/sci-mathematics/reduce/metadata.xml b/sci-mathematics/reduce/metadata.xml
index 1ad5825d..523cb94a 100644
--- a/sci-mathematics/reduce/metadata.xml
+++ b/sci-mathematics/reduce/metadata.xml
@@ -1,24 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- <description>maintainer of the updates in the mv overlay</description>
- </maintainer>
- <maintainer type="person">
- <email>grozin@gentoo.org</email>
- <name>Andrey Grozin</name>
- </maintainer>
- <maintainer type="project">
- <email>sci-mathematics@gentoo.org</email>
- <name>Gentoo Mathematics Project</name>
- </maintainer>
- <longdescription lang="en">
+<herd>sci-mathematics</herd>
+<maintainer>
+ <email>grozin@gentoo.org</email>
+ <name>Andrey Grozin</name>
+</maintainer>
+<longdescription lang="en">
A general-purpose computer algebra system.
Powerful, mature and efficient.
</longdescription>
- <upstream>
- <remote-id type="sourceforge">reduce-algebra</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/sci-mathematics/reduce/reduce-20141130-r3.ebuild b/sci-mathematics/reduce/reduce-20141130-r1.ebuild
index c6b4d035..80f9ed9e 100644
--- a/sci-mathematics/reduce/reduce-20141130-r3.ebuild
+++ b/sci-mathematics/reduce/reduce-20141130-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
-inherit elisp-common
+inherit elisp-common eutils multilib
DESCRIPTION="A general-purpose computer algebra system"
HOMEPAGE="http://reduce-algebra.sourceforge.net/
@@ -25,15 +26,13 @@ RDEPEND="X? ( x11-libs/libXrandr
x11-libs/libXcursor
x11-libs/libXft )
gnuplot? ( sci-visualization/gnuplot )
- emacs? ( app-editors/emacs )"
+ emacs? ( virtual/emacs )"
DEPEND="${RDEPEND}"
src_prepare() {
sed -i -e '2iecho gentoo; exit' -- "${S}"/scripts/findos.sh
# sed -i -e 's/\${l}/"\${l}"/g' -- "${S}"/scripts/make.sh
- sed -i -e 's/static char unmapTable/static unsigned char unmapTable/' \
- -- "${S}"/csl/fox/src/FXShowMath.cpp
- default
+ epatch_user
}
src_configure() {
@@ -83,12 +82,12 @@ src_install() {
doins reduce.img csl.img
insinto /usr/share/${PN}
doins -r ${PN}.doc
- mv -- "${ED}"usr/share/${PN}/${PN}.doc "${ED}"usr/share/${PN}/doc
- dosym ../../share/${PN}/doc /usr/${lib}/${PN}/${PN}.doc
+ mv "${D}"usr/share/${PN}/${PN}.doc "${D}"usr/share/${PN}/doc
+ dosym /usr/share/${PN}/doc /usr/${lib}/${PN}/${PN}.doc
if use X; then
doins -r ${PN}.fonts
- mv -- "${ED}"usr/share/${PN}/${PN}.fonts "${ED}"usr/share/${PN}/fonts
- dosym ../../share/${PN}/fonts /usr/${lib}/${PN}/${PN}.fonts
+ mv "${D}"usr/share/${PN}/${PN}.fonts "${D}"usr/share/${PN}/fonts
+ dosym /usr/share/${PN}/fonts /usr/${lib}/${PN}/${PN}.fonts
fi
popd > /dev/null
diff --git a/sci-mathematics/reduce/reduce-20190413.ebuild b/sci-mathematics/reduce/reduce-20190413.ebuild
deleted file mode 100644
index 24ce5287..00000000
--- a/sci-mathematics/reduce/reduce-20190413.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-inherit elisp-common flag-o-matic
-
-DESCRIPTION="A general-purpose computer algebra system"
-HOMEPAGE="http://reduce-algebra.sourceforge.net/
- http://reduce-algebra.com/"
-IUSE="doc emacs gnuplot tinfo X"
-PVyear=${PV%????}
-PVday=${PV#??????}
-PVmonth=${PV#????}
-PVmonth=${PVmonth%??}
-mPV="${PVyear}-${PVmonth}-${PVday}"
-#TARBALL="${PN}-src-${mPV}"
-TARBALL="Reduce-svn4961-src"
-SRC_URI="mirror://sourceforge/${PN}-algebra/snapshot_${mPV}/${TARBALL}.tar.gz"
-LICENSE="BSD-2 X? ( LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="" # The ebuild is currently broken
-S="${WORKDIR}/${TARBALL}"
-
-RDEPEND="X? ( x11-libs/libXrandr
- x11-libs/libXcursor
- x11-libs/libXft )
- sys-libs/ncurses[tinfo=]
- gnuplot? ( sci-visualization/gnuplot )
- emacs? ( app-editors/emacs )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- sed -i -e '2iecho gentoo; exit' -- "${S}"/scripts/findos.sh
- # sed -i -e 's/\${l}/"\${l}"/g' -- "${S}"/scripts/make.sh
- sed -i -e 's/static char unmapTable/static unsigned char unmapTable/' \
- -- "${S}"/csl/fox/src/FXShowMath.cpp
- # This is currently only a hack for testing; a proper fix needs patching
- ! use tinfo || append-ldflags -ltinfo
- default
-}
-
-src_configure() {
- # If you pass --prefix to this damn configure,
- # make (not make install!) will try to install stuff
- # into the live file system => sandbox violation
- # Therefore, I cannot use econf here
- # Also, make calls configure in maintainer mode in subdirs *by design*
- # The trunk sucks less => WONTFIX until the next release
- ./configure --with-csl $(use_with X gui)
- # psl build requires Internet connection at build time
- # we cannot support it
-}
-
-src_compile() {
- emake -j1 STRIP=true
-
- pushd cslbuild/*/csl/reduce.doc > /dev/null
- rm -f *.txt *.tex
- popd > /dev/null
-
- if use emacs; then
- einfo "Compiling emacs lisp files"
- elisp-compile generic/emacs/*.el || die "elisp-compile failed"
- fi
-}
-
-src_test() {
- emake -j1 testall || die "emake testall failed"
-}
-
-src_install() {
- local lib="$(get_libdir)"
- dodoc README BUILDING DEPENDENCY_TRACKING
- pushd bin > /dev/null
- cp "${FILESDIR}"/redcsl "${FILESDIR}"/csl .
- sed -e "s/lib/${lib}/" -i redcsl
- sed -e "s/lib/${lib}/" -i csl
- exeinto /usr/bin
- doexe redcsl csl
- popd > /dev/null
-
- pushd cslbuild/*/csl > /dev/null
- exeinto /usr/${lib}/${PN}
- doexe reduce csl
- insinto /usr/$(get_libdir)/${PN}
- doins reduce.img csl.img
- insinto /usr/share/${PN}
- doins -r ${PN}.doc
- mv -- "${ED}"usr/share/${PN}/${PN}.doc "${ED}"usr/share/${PN}/doc
- dosym ../../share/${PN}/doc /usr/${lib}/${PN}/${PN}.doc
- if use X; then
- doins -r ${PN}.fonts
- mv -- "${ED}"usr/share/${PN}/${PN}.fonts "${ED}"usr/share/${PN}/fonts
- dosym ../../share/${PN}/fonts /usr/${lib}/${PN}/${PN}.fonts
- fi
- popd > /dev/null
-
- if use doc; then
- insinto /usr/share/doc/${PF}
- doins doc/util/r38.pdf
- fi
-
- if use emacs; then
- pushd generic/emacs > /dev/null
- elisp-install ${PN} *.el *.elc || die "elisp-install failed"
- elisp-site-file-install "${FILESDIR}/64${PN}-gentoo.el"
- popd > /dev/null
- fi
-}
diff --git a/sys-apps/cpi/ChangeLog b/sys-apps/cpi/ChangeLog
new file mode 100644
index 00000000..01690301
--- /dev/null
+++ b/sys-apps/cpi/ChangeLog
@@ -0,0 +1,107 @@
+# ChangeLog for sys-apps/cpi
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*cpi-2.10 (30 Aug 2015)
+
+ 30 Aug 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpi-2.9 (12 Jul 2015)
+
+ 12 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpi-2.8 (16 Jun 2015)
+
+ 15 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpi-2.7-r1 (14 Dec 2013)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 14 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix sh path
+
+*cpi-2.7 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpi-2.5 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Shebang care
+
+*cpi-2.4 (23 Aug 2013)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 23 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpi-2.3 (12 Mar 2013)
+
+ 12 Mar 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpi-2.2 (05 Oct 2012)
+
+ 05 Oct 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpi-2.1 (04 Oct 2012)
+
+ 04 Oct 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpi-2.0 (01 Sep 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 01 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support now also mvi
+
+*cpi-1.6 (07 May 2012)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpi-1.5 (04 May 2012)
+
+ 04 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpi-1.4 (08 Apr 2012)
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 08 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpi-1.3 (28 Feb 2012)
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*cpi-1.2 (05 Feb 2012)
+
+ 05 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+ Allow touch or forcing of cp -a; options -tfh; diff -q; zsh completion
+
+*cpi-1.0 (03 Feb 2012)
+
+ 03 Feb 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/sys-apps/cpi/Manifest b/sys-apps/cpi/Manifest
index bfcb2ef1..50552014 100644
--- a/sys-apps/cpi/Manifest
+++ b/sys-apps/cpi/Manifest
@@ -1 +1 @@
-DIST cpi-3.2.tar.gz 4297 SHA512 6623dbb683a3a07e58e97801176d586b08018f7b24560f0c7c035dd62f76e7018db9c9299c5eb8c11d4a78402841ffdbff7af22ecf35cae49eb0f71cebf595eb
+DIST cpi-2.10.tar.gz 3416 SHA256 67d6ea00b9817c1da523158ea61ed4441683343b9df83babdf1b707ac7d6d35f SHA512 19e6c6aa297e7ebba73eddfe1eb1d78252756eda39ac34b82557747c78789d0503e824d9e2902e42d63c1bea1c49becf02ad5c6b7c4fd4737a29e6708a2f4633 WHIRLPOOL 9592f1bab4a3a516a3e94e45c60a80046e963f47347099820f8a5a5649e207e403780b712eeb613be9d2dadbee15b781f35ce7c2f39ef6b393866ef62decc7cf
diff --git a/sys-apps/cpi/cpi-3.2.ebuild b/sys-apps/cpi/cpi-2.10.ebuild
index 36ef7c96..736a1051 100644
--- a/sys-apps/cpi/cpi-3.2.ebuild
+++ b/sys-apps/cpi/cpi-2.10.ebuild
@@ -1,8 +1,10 @@
-# Copyright 2012-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
+inherit eutils
DESCRIPTION="A wrapper for cp -i -a, making use of diff"
HOMEPAGE="https://github.com/vaeth/cpi/"
@@ -10,14 +12,14 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE=""
src_prepare() {
use prefix || sed -i \
-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-- bin/cpi || die
- default
+ epatch_user
}
src_install() {
diff --git a/sys-apps/cpi/metadata.xml b/sys-apps/cpi/metadata.xml
index f4fe79d5..4b3260b1 100644
--- a/sys-apps/cpi/metadata.xml
+++ b/sys-apps/cpi/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog
new file mode 100644
index 00000000..2c3027ba
--- /dev/null
+++ b/sys-apps/less/ChangeLog
@@ -0,0 +1,240 @@
+# ChangeLog for sys-apps/less
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*less-481.ebuild (02 Aug 2015)
+
+ 02 Aug 2015; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-479.ebuild (11 Jul 2015)
+
+ 11 Jul 2015; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-478.ebuild (27 May 2015)
+
+ 27 May 2015; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-477.ebuild (24 May 2015)
+
+ 24 May 2015; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-476.ebuild (15 May 2015)
+
+ 15 May 2015; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-475.ebuild (10 Mar 2015)
+
+ 10 Mar 2015; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-474.ebuild (07 Feb 2015)
+
+ 07 Feb 2015; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-471.ebuild (16 Nov 2014)
+
+ 16 Nov 2014; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-470.ebuild (06 Oct 2014)
+
+ 22 Sep 2014; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-468.ebuild (22 Sep 2014)
+
+ 24 Sep 2014; Martin Väth <martin@mvath.de>:
+ Remove some arches to make repoman happy
+
+ 22 Sep 2014; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-462-r1.ebuild (24 Dec 2013)
+
+ 13 Sep 2014; Martin Väth <martin@mvath.de>:
+ More precise perl deps
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 24 Dec 2013; Martin Väth <martin@mvath.de>:
+ Bump gentoo-builtin lesspipe
+
+*less-462.ebuild (18 Dec 2013)
+
+ 18 Dec 2013; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-460-r1.ebuild (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Bump less-select version
+
+*less-460.ebuild (13 Jul 2013)
+
+ 14 Aug 2013; Martin Väth <martin@mvath.de>:
+ Simplify EPREFIX (without revision bump)
+
+ 13 Jul 2013; Martin Väth <martin@mvath.de>:
+ Bump less, less-select, and patch version
+
+*less-459-r1.ebuild (28 May 2013)
+
+ 28 May 2013; Martin Väth <martin@mvath.de>:
+ Bump less-select version. Update dependencies
+
+*less-459.ebuild (28 May 2013)
+
+ 28 May 2013; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-458.ebuild (05 Apr 2013)
+
+ 05 Apr 2013; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-457.ebuild (10 Dec 2012)
+
+ 20 Feb 2013; Martin Väth <martin@mvath.de>:
+ Update code2color handling from main tree
+
+ 10 Dec 2012; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-456.ebuild (09 Nov 2012)
+
+ 09 Nov 2012; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-452.ebuild (23 Oct 2012)
+
+ 23 Oct 2012; Martin Väth <martin@mvath.de>:
+ Bump less version. Add USE=sources
+
+*less-451.ebuild (23 Jul 2012)
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 23 Jul 2012; Martin Väth <martin@mvath.de>:
+ Bump less version. Simplify doc install and pcre passing as in main tree
+
+*less-450.ebuild (16 Jul 2012)
+
+ 16 Jul 2012; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-449.ebuild (28 Jun 2012)
+
+ 28 Jun 2012; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-445-r1.ebuild (10 Nov 2011)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 02 Mar 2012; Martin Väth <martin@mvath.de>:
+ Change to github repository
+
+ 31 Jan 2012; Martin Väth <martin@mvath.de>:
+ Bump lesspipe.sh from tree
+
+ 17 Nov 2011; Martin Väth <martin@mvath.de>:
+ Update editor dependency as in portage main tree
+
+ 10 Nov 2011; Martin Väth <martin@mvath.de>:
+ Follow revision upgrade from gentoo: support pcre
+ Put keyfiles into ${EPREFIX}/etc/less subdirectories
+
+*less-445.ebuild (28 Oct 2011)
+
+ 28 Oct 2011; Martin Väth <martin@mvath.de>:
+ Bump less version
+
+*less-444.ebuild (09 Jun 2011)
+
+ 09 Jun 2011; Martin Väth <martin@mvath.de>:
+ Bump less version. Remove old ebuild. Fix some typos concerning env.d
+
+*less-443.ebuild (06 Jun 2011)
+
+ 06 Jun 2011; Martin Väth <martin@mvath.de>:
+ -less-select-443.ebuild +less-443.ebuild
+ Rename into less to avoid problems with portage hard-depending on less.
+ In fact, less-select is just less with additional options which therefore
+ should be provided by a useflag
+
+*less-select-443.ebuild (11 Apr 2011)
+
+ 11 Apr 2011; Martin Väth <martin@mvath.de>:
+ Bump less version. Remove old ebuild
+
+*less-select-441.ebuild (28 Feb 2011)
+
+ 29 Feb 2011; Martin Väth <martin@mvath.de>:
+ Bump less version. Remove old ebuild
+
+*less-select-440.ebuild (06 Jan 2011)
+
+ 04 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump less version. Remove old ebuild
+
+*less-select-438.ebuild (01 Jan 2011)
+
+ 04 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4
+
+ 01 Jan 2011; Martin Väth <martin@mvath.de>: :
+ Bump less version. Remove old ebuild
+
+*less-select-436-r1.ebuild (30 Mar 2010)
+
+ 12 Jun 2010; Martin Väth <martin@mvath.de>: :
+ Remove unneeded files/less.envd. Remove arches which I never tested
+
+ 30 Mar 2010; Martin Väth <martin@mvath.de>: :
+ Update lesspipe.sh and related changes of sys-apps/less in portage tree
+
+ 22 Jul 2009; Martin Väth <martin@mvath.de>: :
+ Version bump to less-select-436
+
+ 12 Apr 2009; Martin Väth <martin@mvath.de>: :
+ Version bump to less-select-429
+
+ 09 Feb 2009; Martin Väth <martin@mvath.de>: :
+ Version bump to less-select-424
+
+ 04 Jan 2008; Martin Väth <martin@mvath.de>: :
+ Version bump to less-select-418
+
+ 29 Nov 2007; Martin Väth <martin@mvath.de>: :
+ Version bump to less-select-416
+
+ 16 Nov 2007; Martin Väth <martin@mvath.de>: :
+ Version bump to less-select-415
+
+ 10 Oct 2007; Martin Väth <martin@mvath.de>: :
+ Version bump to less-select-409
+
+ 29 Jun 2007; Martin Väth <martin@mvath.de>: :
+ Version bump to less-select-406
+
+ 29 Dec 2005; Martin Väth <martin@mvath.de>: :
+ Version bump to less-select-394
+
+ 03 Dec 2005; Martin Väth <martin@mvath.de>: :
+ Version bump to less-select-393
+
+ 06 Mar 2005; Martin Väth <martin@mvath.de>: :
+ Initial version based on less-382-r2.ebuild
+
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index a8984697..002809e8 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,2 +1,3 @@
-DIST less-590.tar.gz 352574 SHA512 426fa5840fd43c17bd5a452ad35ad24f2d6684623c6914403fd0059af62266bf2138e6828c7d73a1cef26a736c0d2b8ed4ab180eea8297281dae79a4228eb903
-DIST less-select-2.13.tar.gz 31432 SHA512 8db0e2cd99e993a9a2bcd180106b0950093561d1d348e8d1f9903a747801ed3261904fe95c10228ddc245375efc791ac53ebfc6c1fe51be810e59f32093fc4f6
+DIST code2color-0.2 200711 SHA256 2365c9009b1cc3c30430b88775ec402164df105fd12364871d05dcaed20be954 SHA512 c0ab9f411d5a106c81334343e3c4a63b67d27b95e2d128145e3ac1ee46cd6c228c61796cf96e51826e69b3e465e7bdaa81b1a48cad934c23b310f2ea2ebd8e75 WHIRLPOOL d0207e84a5849c554b1dfc5882ab46d8afc411c7d26e912235ec05565880e6ed0db8449133502234a01ae8f59feae211486b6a523e37859d8404f72fff9b8f93
+DIST less-481.tar.gz 316622 SHA256 3fa38f2cf5e9e040bb44fffaa6c76a84506e379e47f5a04686ab78102090dda5 SHA512 29995757ac416ed6770cf6e82e6fe325bd1d61d51666d80c4fe72b2b4217b0b1d706d337d89ed54bdc4d83d57f3e2c0166e642b20ef2ad194e52aad630b3e717 WHIRLPOOL e5c8b22d7d1149feafdad0130e00aa5564e818a845c3b4e2b6d151e851dd64ff390fdad01ee79580fe6ab92defc11930d3f3e0ca0d189d2882419444a3d7028c
+DIST less-select-2.6.tar.gz 26354 SHA256 df4ab8f17568cabd864358e5f0a765241f586b8c30341116a649db91db9048bf SHA512 d674e2bcbda2155bd3da862452a78f8aa410661b887ab1c28ac2b338bd602335bbaaebf4daaf3eba120400b2d58244c98e5a96d4d2c7b74fb5b12e2210dbb00d WHIRLPOOL 04a2df34bb0daf0b86044f887bf10a6af9d941314028b052f5dfe7c0dbd4e74ecb69f88eaf8c24dbad446e8de1bcc81401118df04e186887eba126362bbb32d5
diff --git a/sys-apps/less/files/README.Gentoo b/sys-apps/less/files/README.Gentoo
new file mode 100644
index 00000000..dca83280
--- /dev/null
+++ b/sys-apps/less/files/README.Gentoo
@@ -0,0 +1,22 @@
+This version of less comes with some Gentoo enhancements:
+ - default lesspipe.sh script to "view" files
+ - colorization support
+
+To see what file types are supported, just read the /usr/bin/lesspipe.sh
+script (it's just a plain text bash script).
+
+Colorization support is disabled by default. To enable it, export the
+LESSCOLOR variable to "yes":
+ $ export LESSCOLOR=yes
+
+We also provide a colorization script, 'code2color', that is used by
+default. If you wish to use another script, simply export the LESSCOLORIZER
+variable to name of the script:
+ $ export LESSCOLORIZER=some-other-script
+
+If you want to use the code2color script and the default color schemes are
+not acceptable, you can develop your own schemes and save them in one of
+the following places:
+ /etc/code2color
+ ~/.code2color
+ CODE2COLOR_CONFIG env var
diff --git a/sys-apps/less/files/code2color-0.2.patch b/sys-apps/less/files/code2color-0.2.patch
new file mode 100644
index 00000000..f8a78250
--- /dev/null
+++ b/sys-apps/less/files/code2color-0.2.patch
@@ -0,0 +1,26 @@
+--- code2color
++++ code2color
+@@ -163,11 +163,11 @@
+ # building up the database
+ # newer entries overwrite old ones
+ my @CONFIG_FILES;
+- push @CONFIG_FILES, "/etc/code2html.config";
++ push @CONFIG_FILES, "/etc/code2color";
+ push @CONFIG_FILES,
+- $ENV{'HOME'}."/.code2html.config" if $ENV{'HOME'};
++ $ENV{'HOME'}."/.code2color" if $ENV{'HOME'};
+ push @CONFIG_FILES,
+- split(/:/,$ENV{'CODE2HTML_CONFIG'}) if $ENV{'CODE2HTML_CONFIG'};
++ split(/:/,$ENV{'CODE2COLOR_CONFIG'}) if $ENV{'CODE2COLOR_CONFIG'};
+ push @CONFIG_FILES,
+ split(/:/,$params{'langfile'}) if $params{'langfile'};
+
+@@ -3192,7 +3192,7 @@
+ #
+
+ $LANGUAGE{'shellscript'} = {
+- 'filename' => '\\.(sh|shell)$',
++ 'filename' => '\\.(ebuild|eclass|sh|shell)$',
+ 'regex' => '^\\s*#\\s*![^\\s]*(sh|bash|ash|zsh|ksh)',
+ 'patterns' => [ {
+ 'name' => 'comment',
diff --git a/sys-apps/less/files/lesspipe-r1.sh b/sys-apps/less/files/lesspipe.sh
index 9dcfea1d..6edaa3ce 100644
--- a/sys-apps/less/files/lesspipe-r1.sh
+++ b/sys-apps/less/files/lesspipe.sh
@@ -1,13 +1,11 @@
#!/bin/bash
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
+#
# Preprocessor for 'less'. Used when this environment variable is set:
# LESSOPEN="|lesspipe %s"
# TODO: handle compressed files better
-[[ -n ${LESSDEBUG+set} ]] && set -x
+[[ -n ${LESSDEBUG} ]] && set -x
trap 'exit 0' PIPE
@@ -19,7 +17,6 @@ guesscompress() {
*.lzma) echo "unlzma -c" ;;
*.lzo) echo "lzop -dc" ;;
*.xz) echo "xzdec" ;;
- *.zst) echo "zstdcat" ;;
*) echo "cat" ;;
esac
}
@@ -62,16 +59,6 @@ lesspipe() {
[[ ${match} == *.${ignore} ]] && exit 0
done
- # Handle non-regular file types.
- if [[ -d $1 ]] ; then
- ls -alF -- "$1"
- return
- elif [[ ! -f $1 ]] ; then
- # Only return if the stat passes. This is needed to handle pseudo
- # arguments like URIs.
- stat -- "$1" && return
- fi
-
case "${match}" in
### Doc files ###
@@ -80,7 +67,6 @@ lesspipe() {
*.[0-9n].gz|*.man.gz|\
*.[0-9n].lzma|*.man.lzma|\
*.[0-9n].xz|*.man.xz|\
- *.[0-9n].zst|*.man.zst|\
*.[0-9][a-z].gz|*.[0-9][a-z].gz)
local out=$(${DECOMPRESSOR} -- "$1" | file -)
case ${out} in
@@ -104,16 +90,14 @@ lesspipe() {
esac
;;
*.dvi) dvi2tty "$1" ;;
- *.ps) ps2ascii "$1" || pstotext "$1" ;;
- *.pdf) pdftotext "$1" - || ps2ascii "$1" || pstotext "$1" ;;
+ *.ps|*.pdf) ps2ascii "$1" || pstotext "$1" || pdftotext "$1" ;;
*.doc) antiword "$1" || catdoc "$1" ;;
*.rtf) unrtf --nopict --text "$1" ;;
*.conf|*.txt|*.log) ;; # force less to work on these directly #150256
- *.json) python -mjson.tool "$1" ;;
### URLs ###
- ftp://*|http://*|https://|*.htm|*.html)
- for b in elinks links2 links lynx ; do
+ ftp://*|http://*|*.htm|*.html)
+ for b in links2 links lynx ; do
${b} -dump "$1" && exit 0
done
html2text -style pretty "$1"
@@ -121,24 +105,23 @@ lesspipe() {
### Tar files ###
*.tar|\
- *.tar.bz2|*.tar.bz|*.tar.gz|*.tar.z|*.tar.zst|\
+ *.tar.bz2|*.tar.bz|*.tar.gz|*.tar.z|\
*.tar.lz|*.tar.tlz|\
*.tar.lzma|*.tar.xz)
${DECOMPRESSOR} -- "$1" | tar tvvf -;;
*.tbz2|*.tbz|*.tgz|*.tlz|*.txz)
- lesspipe "$1" "$1.tar.${1##*.t}" ;;
+ lesspipe "$1" "$1".tar.${1##*.t} ;;
### Misc archives ###
*.bz2|\
*.gz|*.z|\
- *.zst|\
*.lz|\
*.lzma|*.xz) ${DECOMPRESSOR} -- "$1" ;;
*.rpm) rpm -qpivl --changelog -- "$1" || rpm2tar -O "$1" | tar tvvf -;;
*.cpi|*.cpio) cpio -itv < "$1" ;;
*.ace) unace l "$1" ;;
*.arc) arc v "$1" ;;
- *.arj) arj l -- "$1" || unarj l "$1" ;;
+ *.arj) unarj l -- "$1" ;;
*.cab) cabextract -l -- "$1" ;;
*.lha|*.lzh) lha v "$1" ;;
*.zoo) zoo -list "$1" || unzoo -l "$1" ;;
@@ -169,9 +152,9 @@ lesspipe() {
### Media ###
*.bmp|*.gif|*.jpeg|*.jpg|*.ico|*.pcd|*.pcx|*.png|*.ppm|*.tga|*.tiff|*.tif|*.webp)
- identify -verbose -- "$1" || file -L -- "$1"
+ identify "$1" || file -L -- "$1"
;;
- *.asf|*.avi|*.flv|*.mkv|*.mov|*.mp4|*.mpeg|*.mpg|*.qt|*.ram|*.rm|*.webm|*.wmv)
+ *.asf|*.avi|*.mov|*.mp4|*.mpeg|*.mpg|*.qt|*.ram|*.rm|*.webm|*.wmv)
midentify "$1" || file -L -- "$1"
;;
*.mp3) mp3info "$1" || id3info "$1" ;;
@@ -214,7 +197,7 @@ lesspipe() {
*)
case $(( recur++ )) in
# Maybe we didn't match due to case issues ...
- 0) lesspipe "$1" "$(echo "$1" | LC_ALL=C tr '[:upper:]' '[:lower:]')" ;;
+ 0) lesspipe "$1" "$(echo $1 | LC_ALL=C tr '[:upper:]' '[:lower:]')" ;;
# Maybe we didn't match because the file is named weird ...
1) lesspipe_file "$1" ;;
@@ -248,15 +231,17 @@ lesspipe() {
esac
}
-if [[ $# -eq 0 ]] ; then
+if [[ -z $1 ]] ; then
echo "Usage: lesspipe <file>"
elif [[ $1 == "-V" || $1 == "--version" ]] ; then
+ Id="cvsid"
cat <<-EOF
- lesspipe (git)
- Copyright 1999-2019 Gentoo Authors
+ $Id$
+ Copyright 2001-2013 Gentoo Foundation
Mike Frysinger <vapier@gentoo.org>
(with plenty of ideas stolen from other projects/distros)
+
EOF
less -V
elif [[ $1 == "-h" || $1 == "--help" ]] ; then
@@ -266,22 +251,24 @@ elif [[ $1 == "-h" || $1 == "--help" ]] ; then
Usage: lesspipe <file>
lesspipe specific settings:
- LESSCOLOR env - toggle colorizing of output (no/yes/always; default: no)
+ LESSCOLOR env - toggle colorizing of output (no/yes/always)
LESSCOLORIZER env - program used to colorize output (default: code2color)
LESSIGNORE - list of extensions to ignore (don't do anything fancy)
You can create per-user filters as well by creating the executable file:
~/.lessfilter
- One argument is passed to it: the file to display. The script should exit 0
- to indicate it handled the file, or non-zero to tell lesspipe to handle it.
+ One argument is passed to it: the file to display.
To use lesspipe, simply add to your environment:
export LESSOPEN="|lesspipe %s"
- Run 'less --help' or 'man less' for more info.
+ Run 'less --help' or 'man less' for more info
EOF
+elif [[ -d $1 ]] ; then
+ ls -alF -- "$1"
else
recur=0
- [[ -z ${LESSDEBUG+set} ]] && exec 2>/dev/null
- lesspipe "$1"
+ [[ -n ${LESSDEBUG} ]] \
+ && lesspipe "$1" \
+ || lesspipe "$1" 2> /dev/null
fi
diff --git a/sys-apps/less/less-590.ebuild b/sys-apps/less/less-481.ebuild
index c78e708e..ddbb26ff 100644
--- a/sys-apps/less/less-590.ebuild
+++ b/sys-apps/less/less-481.ebuild
@@ -1,31 +1,38 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
+inherit eutils
+
+CODE2COLOR_PV="0.2"
+CODE2COLOR_P="code2color-${CODE2COLOR_PV}"
DESCRIPTION="Excellent text file viewer, optionally with additional selection feature"
PATCHN="less-select"
-PATCHV="2.13"
-PATCHVER="590"
+PATCHV="2.6"
+PATCHVER="466"
PATCHRUMP="${PATCHN}-${PATCHV}"
PATCHBALL="${PATCHRUMP}.tar.gz"
SELECTDIR="${WORKDIR}/${PATCHRUMP}"
HOMEPAGE="http://www.greenwoodsoftware.com/less/ https://github.com/vaeth/${PATCHN}"
SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz
- less-select? ( https://github.com/vaeth/${PATCHN}/archive/v${PATCHV}.tar.gz -> ${PATCHBALL} )"
+ less-select? ( https://github.com/vaeth/${PATCHN}/archive/v${PATCHV}.tar.gz -> ${PATCHBALL} )
+ http://www-zeuthen.desy.de/~friebel/unix/less/code2color -> ${CODE2COLOR_P}"
LICENSE="|| ( GPL-3 BSD-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+lesspipe +less-select pcre original-gentoo source unicode"
DEPEND=">=app-misc/editor-wrapper-3
- >=sys-libs/ncurses-5.2:0=
- pcre? ( dev-libs/libpcre2 )"
+ >=sys-libs/ncurses-5.2
+ pcre? ( dev-libs/libpcre )"
RDEPEND="${DEPEND}
- less-select? ( dev-lang/perl )"
-# || ( >=dev-lang/perl-5.10.1 >=virtual/perl-File-Temp-0.19 )
-PDEPEND="lesspipe? ( app-text/lesspipe )"
+ less-select? ( dev-lang/perl
+ || ( >=dev-lang/perl-5.10.1 >=virtual/perl-File-Temp-0.19 )
+ )"
+PDEPEND="lesspipe? ( sys-apps/lesspipe )"
pkg_setup() {
if use source && ! use less-select
@@ -33,24 +40,32 @@ pkg_setup() {
fi
}
+src_unpack() {
+ unpack ${P}.tar.gz
+ cp "${DISTDIR}/${CODE2COLOR_P}" "${S}"/code2color || die
+ if use less-select
+ then unpack ${PATCHBALL}
+ fi
+}
+
src_prepare() {
if use less-select
- then eapply "${SELECTDIR}/patches/less-${PATCHVER}-select.patch"
+ then epatch "${SELECTDIR}/patches/less-${PATCHVER}-select.patch" || die
"${SELECTDIR}"/after-patch || die "${SELECTDIR}/after-patch failed"
sed -i -e 's|\([^a-zA-Z]\)/etc/less-select-key.bin|\1'"${EPREFIX}"'/etc/less/select-key.bin|g' \
"${SELECTDIR}/bin/less-select" || die
fi
- default
+ epatch "${FILESDIR}/${CODE2COLOR_P}.patch"
+ chmod a+x configure || die
+ epatch_user
}
src_configure() {
export ac_cv_lib_ncursesw_initscr=$(usex unicode)
export ac_cv_lib_ncurses_initscr=$(usex !unicode)
- local myeconfargs=(
- --with-regex=$(usex pcre pcre2 posix)
+ econf \
+ --with-regex=$(usex pcre pcre posix) \
--with-editor="${EPREFIX}"/usr/libexec/editor
- )
- econf "${myeconfargs[@]}"
}
src_compile() {
@@ -65,20 +80,22 @@ src_install() {
local a
default
- newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe
-
+ if ! use lesspipe
+ then dobin code2color
+ newbin "${FILESDIR}"/lesspipe.sh lesspipe
+ dosym lesspipe /usr/bin/lesspipe.sh
+ fi
if use original-gentoo
then a="-R -M --shift 5"
else a="-sFRiMX --shift 5"
fi
- printf '%s\n' \
- 'LESSOPEN="|lesspipe'$(! use lesspipe || echo .sh)' %s"' \
- "LESS=\"${a}\"" \
- >70less || die
+ printf '%s\n' 'LESSOPEN="|lesspipe.sh %s"' "LESS=\"${a}\"" >70less
doenvd 70less
+ dodoc "${FILESDIR}"/README.Gentoo
+
if use less-select
- then newdoc "${SELECTDIR}"/README.md README.less-select
+ then newdoc "${SELECTDIR}"/README README.less-select
dobin "${SELECTDIR}/bin/"*
insinto /etc/less
doins select-key.bin normal-key.bin
@@ -88,3 +105,8 @@ src_install() {
fi
fi
}
+
+pkg_postinst() {
+ use lesspipe || \
+ elog "lesspipe offers colorization options. Run 'lesspipe -h' for info."
+}
diff --git a/sys-apps/less/metadata.xml b/sys-apps/less/metadata.xml
index 0ef0204f..b6405b97 100644
--- a/sys-apps/less/metadata.xml
+++ b/sys-apps/less/metadata.xml
@@ -1,25 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <herd>base-system</herd>
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
- </maintainer>
<upstream>
<maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
+ <description>Maintainer of the less-select patch</description>
</maintainer>
<bugs-to>mailto:martin@mvath.de</bugs-to>
<remote-id type="github">vaeth/less-select</remote-id>
</upstream>
<use>
<flag name="original-gentoo">Use the gentoo default for the LESS variable.</flag>
- <flag name="lesspipe">Default to lesspipe.sh from app-text/lesspipe instead of the gentoo specific lesspipe.</flag>
+ <flag name="lesspipe">Use sys-apps/lesspipe instead of Gentoo's default lesspipe.sh.</flag>
<flag name="less-select">Add the less-select feature (additional options and a binary helper).</flag>
<flag name="source">Install sources for keybindings (only useful with less-select).</flag>
</use>
diff --git a/sys-apps/lesspipe/ChangeLog b/sys-apps/lesspipe/ChangeLog
new file mode 100644
index 00000000..e77fbfa6
--- /dev/null
+++ b/sys-apps/lesspipe/ChangeLog
@@ -0,0 +1,27 @@
+# ChangeLog for sys-apps/lesspipe
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*lesspipe-1.83 (10 Oct 2015)
+
+ 10 Oct 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*lesspipe-1.82 (24 Dec 2013)
+
+ 18 Jan 2015; Martin Väth <martin@mvath.de>:
+ Re-add arches and fix dependencies properly
+
+ 24 Sep 2014; Martin Väth <martin@mvath.de>:
+ Fix dependencies. Remove some arches to make repoman happy
+
+ 21 Sep 2014; Martin Väth <martin@mvath.de>:
+ Add RESTRICT=mirror
+
+ 24 Dec 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*lesspipe-1.72 (11 Nov 2012)
+
+ 11 Nov 2012; Martin Väth <martin@mvath.de>:
+ New Ebuild from scratch
diff --git a/sys-apps/lesspipe/Manifest b/sys-apps/lesspipe/Manifest
new file mode 100644
index 00000000..0e2dc272
--- /dev/null
+++ b/sys-apps/lesspipe/Manifest
@@ -0,0 +1 @@
+DIST lesspipe-1.83.tar.gz 115129 SHA256 d616f0d51852e60fb0d0801eec9c31b10e0acc6fdfdc62ec46ef7bfd60ce675e SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d WHIRLPOOL 4ff4baac25c768a4177d71a82f766b326cff6840e0032d6b9125506de38ff20264b71c765cb08777adda9e9f24e18e33e452667be8e7a94f7fef062f1d6f019f
diff --git a/sys-apps/lesspipe/lesspipe-1.83.ebuild b/sys-apps/lesspipe/lesspipe-1.83.ebuild
new file mode 100644
index 00000000..be9849e0
--- /dev/null
+++ b/sys-apps/lesspipe/lesspipe-1.83.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+
+inherit eutils
+
+DESCRIPTION="Wolfgang Friebel's preprocessor for sys-apps/less. Append colon to filename to disable"
+HOMEPAGE="http://www-zeuthen.desy.de/~friebel/unix/lesspipe.html"
+SRC_URI="http://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="antiword cabextract catdoc +cpio +djvu dpkg +dvi2tty +elinks fastjar +ghostscript gpg +groff hdf5 +html2text id3v2 image isoinfo libplist +links +lynx lzip mp3info mp3info2 netcdf ooffice p7zip pdf pstotext rar rpm +rpm2targz unrar unrtf +unzip +w3m xlhtml"
+
+htmlmode="( || ( html2text links lynx elinks w3m ) )"
+REQUIRED_USE="!rpm2targz? ( rpm? ( cpio ) )
+ ooffice? ${htmlmode}
+ xlhtml? ${htmlmode}
+ amd64-fbsd? ( !antiword !catdoc !dpkg !elinks !fastjar !html2text
+ !id3v2 !lzip !mp3info !mp3info2 !ooffice !p7zip !pstotext
+ !rar !rpm !unrtf !w3m !xlhtml )
+ alpha? ( !catdoc !fastjar !id3v2 !libplist !mp3info !mp3info2
+ !ooffice !pstotext !rar )
+ arm? ( !antiword !catdoc !fastjar !html2text !id3v2 !mp3info
+ !ooffice !pstotext !rar !xlhtml )
+ hppa? ( !catdoc !fastjar !libplist !mp3info2 !ooffice !rar !w3m !xlhtml )
+ ia64? ( !antiword !catdoc !fastjar !id3v2 !libplist !mp3info !mp3info2
+ !ooffice !pstotext !rar !xlhtml )
+ ppc64? ( !catdoc !fastjar !ooffice !xlhtml )
+ sparc? ( !catdoc !fastjar !id3v2 !libplist !mp3info2 !ooffice !pstotext )"
+
+RDEPEND="sys-apps/file
+ app-arch/xz-utils
+ app-arch/bzip2
+ dev-lang/perl
+ sys-apps/less[lesspipe]
+ unzip? ( app-arch/unzip )
+ fastjar? ( !amd64-fbsd? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc64?
+ ( !sparc? ( app-arch/fastjar ) ) ) ) ) ) ) )
+ unrar? ( app-arch/unrar )
+ !unrar? (
+ rar? ( !amd64-fbsd? ( !alpha? ( !arm? ( !hppa? ( !ia64?
+ ( app-text/o3read ) ) ) ) ) )
+ )
+ lzip? ( !amd64-fbsd? ( app-arch/lzip ) )
+ p7zip? ( !amd64-fbsd? ( app-arch/p7zip ) )
+ cpio? ( app-arch/cpio )
+ cabextract? ( app-arch/cabextract )
+ hdf5? ( sci-libs/hdf5 )
+ html2text? ( !amd64-fbsd? ( !arm? ( app-text/html2text ) ) )
+ !html2text? (
+ links? ( www-client/links )
+ !links? (
+ lynx? ( www-client/lynx )
+ !lynx? (
+ elinks? ( !amd64-fbsd? ( www-client/elinks ) )
+ !elinks? (
+ w3m? ( !amd64-fbsd? ( !hppa? ( www-client/w3m ) ) )
+ )
+ )
+ )
+ )
+ groff? ( sys-apps/groff )
+ rpm2targz? ( app-arch/rpm2targz )
+ !rpm2targz? (
+ rpm? ( !amd64-fbsd? ( || ( app-arch/rpm app-arch/rpm5 ) ) )
+ )
+ antiword? ( !amd64-fbsd? ( !arm? ( !ia64? ( app-text/antiword ) ) ) )
+ !antiword? (
+ catdoc? ( !amd64-fbsd? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc64?
+ ( !sparc? ( app-text/catdoc ) ) ) ) ) ) ) )
+ )
+ xlhtml? ( !amd64-fbsd? ( !arm? ( !hppa? ( !ia64? ( !ppc64?
+ ( app-text/xlhtml ) ) ) ) ) )
+ unrtf? ( !amd64-fbsd? ( app-text/unrtf ) )
+ ooffice? ( !amd64-fbsd? ( !alpha? ( !arm? ( !hppa? ( !ia64? ( !ppc64?
+ ( !sparc? ( app-text/o3read ) ) ) ) ) ) ) )
+ djvu? ( app-text/djvu )
+ dvi2tty? ( dev-tex/dvi2tty )
+ pstotext? ( !amd64-fbsd? ( !alpha? ( !arm? ( !ia64? ( !sparc?
+ ( app-text/pstotext ) ) ) ) ) )
+ !pstotext? (
+ ghostscript? ( app-text/ghostscript-gpl )
+ )
+ gpg? ( app-crypt/gnupg )
+ pdf? ( app-text/poppler )
+ id3v2? ( !amd64-fbsd? ( !alpha? ( !arm? ( !ia64? ( !sparc?
+ ( media-sound/id3v2 ) ) ) ) ) )
+ !id3v2? (
+ mp3info2? ( !amd64-fbsd? ( !alpha? ( !hppa? ( !ia64? ( !sparc?
+ ( dev-perl/MP3-Tag ) ) ) ) ) )
+ !mp3info2? (
+ mp3info? ( !amd64-fbsd? ( !alpha? ( !arm? ( !ia64?
+ ( media-sound/mp3info ) ) ) ) )
+ )
+ )
+ image? ( || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) )
+ isoinfo? ( || ( app-cdr/cdrtools app-cdr/dvd+rw-tools app-cdr/cdrkit ) )
+ libplist? ( !alpha? ( !hppa? ( !ia64? ( !sparc? ( app-pda/libplist ) ) ) ) )
+ dpkg? ( !amd64-fbsd? ( app-arch/dpkg ) )
+ hdf5? ( sci-libs/hdf5 )
+ netcdf? ( sci-libs/netcdf )"
+DEPEND="${RDEPEND}"
+
+ModifyStart() {
+ sedline=
+}
+
+Modify() {
+ if [ -z "${sedline:++}" ]
+ then sedline='/^__END__$/,${'
+ else sedline=${sedline}';'
+ fi
+ sedline=${sedline}'s/^\('${1}'[[:space:]][[:space:]]*\)[nNyY]/\1'${2:-Y}'/'
+}
+
+ModifyEnd() {
+ sedline=${sedline}'}'
+ sed -i -e "${sedline}" "${S}/configure"
+}
+
+ModifyY() {
+ local i
+ for i
+ do Modify "${i}"
+ done
+}
+
+ModifyN() {
+ local i
+ for i
+ do Modify "${i}" N
+ done
+}
+
+ModifyX() {
+ if [ ${?} -eq 0 ]
+ then ModifyY "${@}"
+ else ModifyN "${@}"
+ fi
+}
+
+ModifyU() {
+ local i
+ for i
+ do use "${i}"; ModifyX "${i}"
+ done
+}
+
+Modify1() {
+ local i search
+ search=:
+ for i
+ do ${search} && use "${i}" && search=false; ModifyX "${i}"
+ done
+}
+
+src_prepare() {
+ printf 'h5dump\t\tN\nncdump\t\tN\n' >>"${S}/configure"
+ ModifyStart
+ ModifyY 'HILITE'
+ ModifyY 'LESS_ADVANCED_PREPROCESSOR'
+ ModifyY 'nm'
+ ModifyY 'iconv'
+ ModifyY 'bzip2'
+ ModifyY 'xz' 'lzma'
+ ModifyY 'perldoc'
+ ModifyU 'unzip' 'fastjar'
+ Modify1 'unrar' 'rar'
+ ModifyU 'lzip'
+ use p7zip; ModifyX '7za'
+ ModifyU 'cpio' 'cabextract' 'groff'
+ Modify1 'html2text' 'links' 'lynx' 'elinks' 'w3m'
+ use rpm2targz; ModifyX 'rpmunpack'
+ ! use rpm2targz && use rpm; ModifyX 'rpm' 'rpm2cpio'
+ Modify1 'antiword' 'catdoc'
+ use xlhtml; ModifyX 'ppthtml' 'xlhtml'
+ ModifyU 'unrtf'
+ use ooffice; ModifyX 'o3tohtml'
+ use djvu; ModifyX 'djvutxt'
+ ModifyU 'dvi2tty'
+ ModifyU 'pstotext'
+ ! use pstotext && use ghostscript; ModifyX 'ps2ascii'
+ ModifyU 'gpg'
+ use pdf; ModifyX 'pdftohtml' 'pdftotext'
+ Modify1 'id3v2' 'mp3info2' 'mp3info'
+ use image; ModifyX 'identify'
+ ModifyU 'isoinfo'
+ ModifyN 'dpkg'
+ ModifyN 'lsbom'
+ use libplist; ModifyX 'plutil'
+ use hdf5; ModifyX 'h5dump'
+ use netcdf; ModifyX 'ncdump'
+ ModifyEnd
+ printf '%s\n' 'LESS_ADVANCED_PREPROCESSOR=1' >70lesspipe
+ epatch_user
+}
+
+src_configure() {
+ ./configure --fixed --prefix=/usr
+}
+
+src_install() {
+ doenvd 70lesspipe
+ dodir /usr/share/man/man1
+ default
+}
diff --git a/app-text/lesspipe/metadata.xml b/sys-apps/lesspipe/metadata.xml
index 1a2cb165..15d3670a 100644
--- a/app-text/lesspipe/metadata.xml
+++ b/sys-apps/lesspipe/metadata.xml
@@ -1,20 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
- <description>maintainer of the updates in the mv overlay</description>
</maintainer>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">wofr06/lesspipe</remote-id>
- </upstream>
<use>
<flag name="antiword">Support doc files with app-text/antiword; this overrides catdoc</flag>
- <flag name="brotli">Support brotli files; requires app-arch/brotli</flag>
<flag name="cabextract">Support cabextract files</flag>
<flag name="catdoc">Support doc files with app-text/catdoc; unused if antiword is set</flag>
<flag name="cpio">Support cpio files</flag>
@@ -31,19 +23,15 @@
<flag name="id3v2">Support mp3 files with media-sound/id3v2; this overrides mp3info2, mp3info</flag>
<flag name="image">Support image/jpg files</flag>
<flag name="isoinfo">Support CD/DVD-iso files</flag>
- <flag name="libreoffice">Support msword and rtf conversion using app-office/libreoffice</flag>
<flag name="libplist">Support Apple Property List files</flag>
<flag name="links">Support html files with www-client/links; ignored if html2text is set; this overrides lynx, elinks, w3m</flag>
<flag name="lynx">Support html files with www-client/lynx; ignored if html2text or links is set; this overrides elinks, w3m</flag>
- <flag name="lz4">Support lz4 files; requires app-arch/lz4</flag>
<flag name="lzip">Support lzip files</flag>
- <flag name="mediainfo">Support media display using media-video/mediainfo</flag>
<flag name="mp3info">Support mp3 files with media-sound/mp3info; unused if id3v2 or mp3info2 is set</flag>
<flag name="mp3info2">Support mp3 files with dev-perl/MP3-Tag (mp3info2); ignored if id3v2 is set; this overrides mp3info</flag>
<flag name="netcdf">Support ncdump from sci-libs/netcdf</flag>
<flag name="ooffice">Support OpenOffice files</flag>
<flag name="p7zip">Support p7zip files</flag>
- <flag name="pandoc">Support msword and rtf conversion using app-text/pandoc</flag>
<flag name="pdf">Support pdf files</flag>
<flag name="pstotext">Support ps files with app-text/pstotext; this overrides ghostscript</flag>
<flag name="rar">Support rar files with app-arch/rar; unused if unrar is set</flag>
@@ -53,8 +41,6 @@
<flag name="unrtf">Support rtf files with app-text/unrtf</flag>
<flag name="unzip">Support zip files with app-arch/unzip</flag>
<flag name="w3m">Support html files with www-client/w3m; ignored if html2text, links, lynx, or elinks is set</flag>
- <flag name="wv">Support msword and rtf conversion using app-text/wv</flag>
<flag name="xlhtml">Support Excel and Powerpoint files with app-arch/xlhtml</flag>
- <flag name="zstd">Support brotli files; requires app-arch/zstd</flag>
</use>
</pkgmetadata>
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
deleted file mode 100644
index 880c77b2..00000000
--- a/sys-apps/man/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST man-1.6g.tar.gz 256906 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
diff --git a/sys-apps/man/files/makewhatis.cron b/sys-apps/man/files/makewhatis.cron
deleted file mode 100644
index bef5ea6d..00000000
--- a/sys-apps/man/files/makewhatis.cron
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# this is part of the man package
-# it updates the search database for manpages
-
-exec nice makewhatis -u
diff --git a/sys-apps/man/files/man-1.5m2-apropos.patch b/sys-apps/man/files/man-1.5m2-apropos.patch
deleted file mode 100644
index 9735a533..00000000
--- a/sys-apps/man/files/man-1.5m2-apropos.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Ripped from Fedora
-
---- man-1.5m2/src/apropos.sh
-+++ man-1.5m2/src/apropos.sh
-@@ -19,9 +19,9 @@
-
- # When man pages in your favorite locale look to grep like binary files
- # (and you use GNU grep) you may want to add the 'a' option to *grepopt1.
--aproposgrepopt1='i'
-+aproposgrepopt1='ai'
- aproposgrepopt2=''
--whatisgrepopt1='iw'
-+whatisgrepopt1='aiw'
- whatisgrepopt2='^'
- grepopt1=$%apropos_or_whatis%grepopt1
- grepopt2=$%apropos_or_whatis%grepopt2
diff --git a/sys-apps/man/files/man-1.6-cross-compile.patch b/sys-apps/man/files/man-1.6-cross-compile.patch
deleted file mode 100644
index 18423691..00000000
--- a/sys-apps/man/files/man-1.6-cross-compile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Fix up to work with cross-compiling ... most of these tests only
-need to see if the example compiled, not whether it runs ...
-
---- configure
-+++ configure
-@@ -232,15 +232,13 @@
-
- echo checking for POSIX.1 header files
- echo "#include <unistd.h>
--main() {
- #ifdef _POSIX_VERSION
--exit(0);
-+main() { exit(0); }
- #else
--exit(1);
--#endif
--}" > conftest.c
-+# error no _POSIX_VERSION
-+#endif" > conftest.c
- eval $compile
--if test -s conftest && ./conftest 2>/dev/null; then
-+if test -s conftest ; then
- DEFS="$DEFS -DPOSIX"
- fi
- rm -f conftest conftest.c
-@@ -249,7 +247,7 @@
- echo "#include <strings.h>
- main() { exit(0); rindex(0, 0); bzero(0, 0); }" > conftest.c
- eval $compile
--if test -s conftest && ./conftest 2>/dev/null; then :
-+if test -s conftest ; then :
- else DEFS="$DEFS -DUSG"
- fi
- rm -f conftest conftest.c
-@@ -258,7 +256,7 @@
- echo '#include <sys/types.h>
- main() { uid_t x; exit(0); }' > conftest.c
- eval $compile
--if test -s conftest && ./conftest 2>/dev/null; then :
-+if test -s conftest ; then :
- else
- uid_t=`awk '/pw_uid;/ {print $1}' $INCLUDEDIR/pwd.h`
- DEFS="$DEFS -Duid_t=${uid_t} -Dgid_t=${uid_t}"
-@@ -291,7 +289,7 @@
- #endif
- main() { char *p = (char *) alloca(1); exit(0); }' > conftest.c
- eval $compile
--if test -s conftest && ./conftest 2>/dev/null; then :
-+if test -s conftest ; then :
- elif test -d /usr/ucblib; then LIBS="$LIBS -L/usr/ucblib -lucb"
- elif test -f /usr/lib/libPW.a; then LIBS="$LIBS -lPW"
- else DEFS="$DEFS -DALLOCA_MISSING"
-@@ -321,7 +319,7 @@
- struct option long_opts[] = { { "", no_argument, NULL, 0 } };
- main() { exit(0); }' > conftest.c
- eval $compile
--if test -s conftest && ./conftest 2>/dev/null; then
-+if test -s conftest ; then
- manpathoption="--path"
- else
- manpathoption="-w"
diff --git a/sys-apps/man/files/man-1.6c-cut-duplicate-manpaths.patch b/sys-apps/man/files/man-1.6c-cut-duplicate-manpaths.patch
deleted file mode 100644
index 9ecaeb70..00000000
--- a/sys-apps/man/files/man-1.6c-cut-duplicate-manpaths.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-http://bugs.gentoo.org/90186
-
-If we have entries in MANPATH that are really symlinks to other entries,
-then many man functions will yield duplicate entries.
-
-Without this patch, we see this behavior:
-$ echo $MANPATH
-/usr/share/man:/usr/man
-$ man --path
-/usr/share/man:/usr/man
-$ ls -ld /usr/share/man /usr/man
-lrwxrwxrwx 1 /usr/man -> /usr/share/man
-drwxr-xr-x 36 /usr/share/man
-$ man -k passwd
-passwd (1) - change user password
-passwd (1) - change user password
-
-With this patch, we get:
-$ echo $MANPATH
-/usr/share/man:/usr/man
-$ man --path
-/usr/share/man
-$ ls -ld /usr/share/man /usr/man
-lrwxrwxrwx 1 /usr/man -> /usr/share/man
-drwxr-xr-x 36 /usr/share/man
-$ man -k passwd
-passwd (1) - change user password
-
---- man-1.6c/src/manpath.c
-+++ man-1.6c/src/manpath.c
-@@ -380,6 +380,44 @@
- }
- }
-
-+void trim_symlinked_manpaths (void);
-+void
-+trim_symlinked_manpaths () {
-+ /*
-+ * Skip symlinks to other entries in path.
-+ * Do this after we've built the entire list.
-+ */
-+ struct stat *stat_cache;
-+ size_t i, j, size;
-+
-+ if (!mandirlist)
-+ return;
-+
-+ for (size = 0; mandirlist[size]; ++size)
-+ /* count # of elements */;
-+ if (size == 0)
-+ return;
-+ /* cache stat information for every element */
-+ stat_cache = (struct stat *) my_malloc (size * sizeof(*stat_cache));
-+ for (i = 0; i < size; ++i)
-+ stat(mandirlist[i], &stat_cache[i]);
-+
-+#define EQU_STAT(s,d) ((s).st_dev == (d).st_dev && (s).st_ino == (d).st_ino)
-+ for (i = 0; i < size; ++i) {
-+ for (j = i+1; j < size; ++j) {
-+ if (EQU_STAT(stat_cache[i], stat_cache[j])) {
-+ /* these two entries are the same, so cut out the second one */
-+ memmove(mandirlist+j, mandirlist+j+1, (size-j)*sizeof(*mandirlist));
-+ memmove(stat_cache+j, stat_cache+j+1, (size-j)*sizeof(*stat_cache));
-+ mandirlist[--size] = NULL;
-+ --j;
-+ }
-+ }
-+ }
-+
-+ free(stat_cache);
-+}
-+
- void
- init_manpath () {
- static int done = 0;
-@@ -391,6 +431,7 @@
- (manp = getenv ("MANPATH")) == NULL)
- manp = ""; /* default path */
- split (manp, to_mandirlist, 0);
-+ trim_symlinked_manpaths ();
- done = 1;
- }
- }
diff --git a/sys-apps/man/files/man-1.6e-headers.patch b/sys-apps/man/files/man-1.6e-headers.patch
deleted file mode 100644
index 9c6fd6f4..00000000
--- a/sys-apps/man/files/man-1.6e-headers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gencat/genlib.c
-+++ gencat/genlib.c
-@@ -49,10 +49,8 @@
-
- #include <stdio.h>
- #include <stdlib.h>
--#ifdef SYSV
- #include <sys/types.h>
- #include <unistd.h>
--#endif
-
- #if !defined(__linux__) && !defined(__FreeBSD__)
- #include <memory.h>
diff --git a/sys-apps/man/files/man-1.6f-makewhatis-compression-cleanup.patch b/sys-apps/man/files/man-1.6f-makewhatis-compression-cleanup.patch
deleted file mode 100644
index a7d74c32..00000000
--- a/sys-apps/man/files/man-1.6f-makewhatis-compression-cleanup.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-http://bugs.gentoo.org/331979
-
-patch by William Throwe <wthrowe@mit.edu>
-
-The problem is that a failed match() resets the RSTART variable used to
-extract filename_no_gz (visible in the trailing context of the patch),
-so it is important that no more match() commands are attempted after the
-successful one. Without the scoping, if (for example) the test for .bz2
-succeeds, it prevents testing for .lzma, but doesn't prevent testing for
-.xz. The failing .xz test causes RSTART to be set to zero so
-filename_no_gz becomes the empty string.
-
---- man-1.6f/src/makewhatis.sh
-+++ man-1.6f/src/makewhatis.sh
-@@ -234,7 +234,7 @@
- find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
-
- function readline() {
-- if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
-+ if (use_compression) {
- result = (pipe_cmd | getline);
- if (result < 0) {
- print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
-@@ -249,7 +249,7 @@
- }
-
- function closeline() {
-- if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
-+ if (use_compression) {
- return close(pipe_cmd);
- } else {
- return close(filename);
-@@ -263,16 +263,20 @@
- if (verbose) {
- print "adding " filename > "/dev/stderr"
- }
--
-+
- use_zcat = match(filename,"\\.Z$") ||
- match(filename,"\\.z$") || match(filename,"\\.gz$");
-- if (!use_zcat)
-+ if (!use_zcat) {
- use_bzcat = match(filename,"\\.bz2");
-- if(!use_bzcat)
-- use_lzcat = match(filename,"\\.lzma");
-- if(!use_lzcat)
-- use_xzcat = match(filename,"\\.xz");
-- if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
-+ if (!use_bzcat) {
-+ use_lzcat = match(filename,"\\.lzma");
-+ if (!use_lzcat) {
-+ use_xzcat = match(filename,"\\.xz");
-+ }
-+ }
-+ }
-+ use_compression = (use_zcat || use_bzcat || use_lzcat || use_xzcat);
-+ if (use_compression) {
- filename_no_gz = substr(filename, 0, RSTART - 1);
- } else {
- filename_no_gz = filename;
-@@ -285,7 +289,7 @@
- actual_section = section;
- }
- sub(/\..*/, "", progname);
-- if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
-+ if (use_compression) {
- if (use_zcat) {
- pipe_cmd = "zcat \"" filename "\"";
- } else if (use_bzcat) {
diff --git a/sys-apps/man/files/man-1.6f-man2html-compression-2.patch b/sys-apps/man/files/man-1.6f-man2html-compression-2.patch
deleted file mode 100644
index b79b3a18..00000000
--- a/sys-apps/man/files/man-1.6f-man2html-compression-2.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-add support for bzip2/lzma to man2html and friends
-
---- man2html/glimpse_filters
-+++ man2html/glimpse_filters
-@@ -1,3 +1,6 @@
-+*.bz2 bzip2 -d -c
-+*.lzma lzma -d -c
-+*.xz xz -d -c
- *.gz gzip -d -c
- *.Z gzip -d -c
-
---- man2html/scripts/cgi-bin/man/man2html
-+++ man2html/scripts/cgi-bin/man/man2html
-@@ -93,6 +93,12 @@
- *.bz2)
- bzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE"
- ;;
-+ *.lzma)
-+ lzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE"
-+ ;;
-+ *.xz)
-+ xzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE"
-+ ;;
- *)
- "$MAN2HTML" "$LL" "$PAGE"
- ;;
-@@ -103,6 +106,12 @@
- elif [ -r "$PAGE".bz2 ]
- then
- bzcat "$PAGE".bz2 | "$MAN2HTML" "$LL" -D "$PAGE"
-+elif [ -r "$PAGE".lzma ]
-+then
-+ lzcat "$PAGE".lzma | "$MAN2HTML" "$LL" -D "$PAGE"
-+elif [ -r "$PAGE".xz ]
-+then
-+ xzcat "$PAGE".xz | "$MAN2HTML" "$LL" -D "$PAGE"
- else
- "$MAN2HTML" -E "Strange... Cannot find (or read) $PAGE."
- fi
---- man2html/scripts/cgi-bin/man/mansearch
-+++ man2html/scripts/cgi-bin/man/mansearch
-@@ -153,7 +153,7 @@
- }
- print "<DT> <a href=\"" cgipath "/man2html?" fullname "\">";
- textname = filename;
-- sub(/\.(gz)|Z|z$/, "", textname);
-+ sub(/\.([zZ]|gz|bz2|lzma|xz)$/, "", textname);
- sub(/\./, "(", textname);
- textname = textname ")";
- print textname;
---- man2html/scripts/cgi-bin/man/mansec
-+++ man2html/scripts/cgi-bin/man/mansec
-@@ -128,7 +128,7 @@
- # Print out alphabetic quick index and other links
- }
- # Split page.n into "page" and "n" and generate an entry
-- sub(/[.]([zZ]|(gz))$/, "", manpage);
-+ sub(/[.]([zZ]|gz|bz2|lzma|xz)$/, "", manpage);
- match(manpage, /[.][^.]+$/);
- title = substr(manpage, 1, RSTART - 1);
- if (section != "all") {
diff --git a/sys-apps/man/files/man-1.6f-parallel-build.patch b/sys-apps/man/files/man-1.6f-parallel-build.patch
deleted file mode 100644
index 41918d92..00000000
--- a/sys-apps/man/files/man-1.6f-parallel-build.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-http://bugs.gentoo.org/207148
-
-patch by Kevin Pyle to fix parallel build issues
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -42,9 +42,12 @@
- makemsg:
- $(BUILD_CC) -o makemsg makemsg.c
-
--msg.c gripedefs.h: ../msgs/mess.en makemsg
-+gripedefs.h: ../msgs/mess.en makemsg
- ./makemsg ../msgs/mess.en gripedefs.h msg.c
-
-+# avoid parallel build issues with makemsg
-+msg.c: gripedefs.h
-+
- # glob.c does not have prototypes
- glob.o: glob.c ndir.h
- $(CC) -c $(CWARNNP) $(CFLAGS) -I. $(DEFS) glob.c
-
-http://bugs.gentoo.org/258916
-
-avoid:
- make[2]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule.
-
---- a/man/Makefile.in
-+++ b/man/Makefile.in
-@@ -3,7 +3,7 @@
- MAN5 = man.conf
- MAN8 = makewhatis
- ALL = man.1 whatis.1 apropos.1 man.conf.5
--MAYBE8 = makewhatis
-+MAYBE8 = $(wildcard makewhatis.man)
-
- .SUFFIXES: .man .1 .5 .8
-
-@@ -21,9 +21,7 @@
- # Where to put the manual pages.
- mandir = $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
-
--all: $(ALL)
-- for i in $(MAYBE8); \
-- do if test -f $$i.man; then make -f ../Makefile $$i.8; fi; done
-+all: $(ALL) $(MAYBE8:.man=.8)
-
- install: $(ALL)
- mkdir -p $(mandir)/man1 $(mandir)/man5 $(mandir)/man8
-@@ -39,18 +37,17 @@
-
- spotless:
-
--subdirs:
-- @for i in @languages@; do if test -d $$i; then echo; \
-- echo "==== Making the `cat $$i.txt` man pages. ===="; \
-- cd $$i; make -f ../Makefile; cd ..; \
-- else echo "==== No $$i man pages found. ===="; fi; done
--
--installsubdirs:
-- @for i in @languages@; do if test -d $$i; then echo; \
-- echo "==== Installing the `cat $$i.txt` man pages. ===="; \
-- cd $$i; SLANG=/$$i; if test $$SLANG = /en; then SLANG= ; fi; \
-- export SLANG; make -f ../Makefile install; cd ..; \
-- else echo "==== No $$i man pages found. ===="; fi; done
-+MAN_LANGS = $(wildcard @languages@)
-+subdirs: $(MAN_LANGS:=_lang_subdir)
-+%_lang_subdir:
-+ @echo "==== Making the `cat $(@:_lang_subdir=).txt` man pages. ===="
-+ $(MAKE) -f ../Makefile -C $(@:_lang_subdir=)
-+
-+installsubdirs: $(MAN_LANGS:=_lang_installsubdir)
-+%_lang_installsubdir:
-+ @echo "==== Making the `cat $(@:_lang_installsubdir=).txt` man pages. ===="
-+ $(MAKE) -f ../Makefile -C $(@:_lang_installsubdir=) install \
-+ SLANG=`s=$(@:_lang_installsubdir=); test $$s = en || echo /$$s`
-
- cleansubdirs:
- @for i in ??; do cd $$i; make -f ../Makefile clean; cd ..; done
diff --git a/sys-apps/man/files/man-1.6f-so-search-2.patch b/sys-apps/man/files/man-1.6f-so-search-2.patch
deleted file mode 100644
index ac42c8df..00000000
--- a/sys-apps/man/files/man-1.6f-so-search-2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-improve the uncompressed .so search
-
---- a/src/man.c
-+++ b/src/man.c
-@@ -381,13 +381,23 @@ again:
- }
- /*
- * Some people have compressed man pages, but uncompressed
-- * .so files - we could glob for all possible extensions,
-- * for now: only try .gz
-+ * .so files - we should discover this list dynamically, but
-+ * for now just hardcode it.
- */
-- else if (fp == NULL && get_expander(".gz") &&
-- strlen(name)+strlen(".gz") < BUFSIZE) {
-- strcat(name, ".gz");
-- fp = fopen (name, "r");
-+ else if (fp == NULL) {
-+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
-+ size_t i, name_len = strlen(name);
-+ const char *extensions[] = { ".gz", ".bz2", ".lzma", ".xz", ".z", ".Z" };
-+ for (i = 0; i < ARRAY_SIZE(extensions); ++i) {
-+ const char *comp = extensions[i];
-+ name[name_len] = '\0';
-+ if (get_expander(comp) && name_len+strlen(comp) < BUFSIZE) {
-+ strcat(name, comp);
-+ fp = fopen(name, "r");
-+ if (fp)
-+ break;
-+ }
-+ }
- }
-
- if (fp == NULL) {
diff --git a/sys-apps/man/files/man-1.6f-unicode.patch b/sys-apps/man/files/man-1.6f-unicode.patch
deleted file mode 100644
index 89d3821d..00000000
--- a/sys-apps/man/files/man-1.6f-unicode.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-let the active locale work its magic
-
-http://bugs.gentoo.org/146315
-
---- man-1.6f/configure
-+++ man-1.6f/configure
-@@ -473,9 +473,9 @@
- then
- if test $Fnroff = "missing"
- then
-- nroff="nroff -Tlatin1 -mandoc"
-+ nroff="nroff -Tascii -c -mandoc"
- else
-- nroff="$Fnroff -Tlatin1 -mandoc"
-+ nroff="$Fnroff -mandoc"
- fi
- troff="troff -mandoc"
- echo "Warning: could not find groff"
-@@ -484,7 +484,7 @@
- then
- nroff="$Fgroff -Tlatin1 -mandoc"
- else
-- nroff="$Fnroff -Tlatin1 -mandoc"
-+ nroff="$Fnroff -mandoc"
- fi
- troff="$Fgroff -Tps -mandoc"
- jnroff="$Fgroff -Tnippon -mandocj"
-
diff --git a/sys-apps/man/files/man-1.6g-compress.patch b/sys-apps/man/files/man-1.6g-compress.patch
deleted file mode 100644
index 374d8073..00000000
--- a/sys-apps/man/files/man-1.6g-compress.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-allow selection of default cache compressor
-
-http://bugs.gentoo.org/205147
-
---- configure
-+++ configure
-@@ -1012,6 +1012,10 @@
- done
- done
-
-+ if [ x$COMPRESS != x ]; then
-+ compress=$COMPRESS
-+ fi
-+
- if [ x$default = x ]; then
- echo ""
- echo "What program should be used to compress the formatted pages?"
diff --git a/sys-apps/man/files/man-1.6g-echo-escape.patch b/sys-apps/man/files/man-1.6g-echo-escape.patch
deleted file mode 100644
index 96e950a5..00000000
--- a/sys-apps/man/files/man-1.6g-echo-escape.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-avoid using escape sequences in echo as they're not portable
-
-https://bugs.gentoo.org/523874
-
---- a/src/man.c
-+++ b/src/man.c
-@@ -626,7 +626,7 @@ make_roff_command (const char *path, const char *file) {
- the current position plus 10 lines. This plus setpl()
- gives us a single page that just contains the whole
- man page. (William Webber, wew@cs.rmit.edu.au) */
-- strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \\n(nlu+10\"");
-+ strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \"; echo \"(nlu+10\"");
- #if 0
- /* In case this doesnt work for some reason,
- michaelkjohnson suggests: I've got a simple
diff --git a/sys-apps/man/files/man-1.6g-fbsd.patch b/sys-apps/man/files/man-1.6g-fbsd.patch
deleted file mode 100644
index ef01a6e0..00000000
--- a/sys-apps/man/files/man-1.6g-fbsd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes compilation in FreeBSD
-
-http://bugs.gentoo.org/138123
-
---- man-1.6g/gencat/genlib.c
-+++ man-1.6g/gencat/genlib.c
-@@ -54,7 +54,7 @@
- #include <unistd.h>
- #endif
-
--#if !defined(__linux__) && !defined(__CYGWIN__)
-+#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
- #include <memory.h>
- static int bcopy(src, dst, length)
- char *src, *dst;
diff --git a/sys-apps/man/files/man-1.6g-gawk-5.patch b/sys-apps/man/files/man-1.6g-gawk-5.patch
deleted file mode 100644
index b4f78008..00000000
--- a/sys-apps/man/files/man-1.6g-gawk-5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 1/src/makewhatis.sh
-+++ 1/src/makewhatis.sh
-@@ -348,7 +348,7 @@
- sub(/^.Li /, ""); # Kill .Li
- sub(/^.Dq /, ""); # Kill .Dq
- sub(/^.Nd */, "- "); # Convert .Nd to dash
-- sub(/\\\".*/, ""); # Trim pending comments
-+ sub(/\\".*/, ""); # Trim pending comments
- sub(/ *$/, ""); # Trim pending spaces
- sub(/^\.$/, ""); # Kill blank comments
- sub(/^'"'"'.*/, ""); # Kill comment/troff lines
diff --git a/sys-apps/man/files/man-1.6g-xz.patch b/sys-apps/man/files/man-1.6g-xz.patch
deleted file mode 100644
index fcf91f71..00000000
--- a/sys-apps/man/files/man-1.6g-xz.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-add support for xz
-
-http://bugs.gentoo.org/302380
-
---- a/src/makewhatis.sh
-+++ b/src/makewhatis.sh
-@@ -230,7 +230,7 @@
- find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
-
- function readline() {
-- if (use_zcat || use_bzcat || use_lzcat) {
-+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- result = (pipe_cmd | getline);
- if (result < 0) {
- print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
-@@ -245,7 +245,7 @@
- }
-
- function closeline() {
-- if (use_zcat || use_bzcat || use_lzcat) {
-+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- return close(pipe_cmd);
- } else {
- return close(filename);
-@@ -266,7 +266,9 @@
- use_bzcat = match(filename,"\\.bz2");
- if(!use_bzcat)
- use_lzcat = match(filename,"\\.lzma");
-- if (use_zcat || use_bzcat || use_lzcat ) {
-+ if(!use_lzcat)
-+ use_xzcat = match(filename,"\\.xz");
-+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- filename_no_gz = substr(filename, 0, RSTART - 1);
- } else {
- filename_no_gz = filename;
-@@ -279,13 +281,15 @@
- actual_section = section;
- }
- sub(/\..*/, "", progname);
-- if (use_zcat || use_bzcat || use_lzcat) {
-+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- if (use_zcat) {
- pipe_cmd = "zcat \"" filename "\"";
- } else if (use_bzcat) {
- pipe_cmd = "bzcat \"" filename "\"";
-- } else {
-+ } else if (use_lzcat) {
- pipe_cmd = "lzcat \"" filename "\"";
-+ } else {
-+ pipe_cmd = "xzcat \"" filename "\"";
- }
- # try to avoid suspicious stuff
- if (filename ~ /[;&|`$(]/) {
diff --git a/sys-apps/man/man-1.6g-r3.ebuild b/sys-apps/man/man-1.6g-r3.ebuild
deleted file mode 100644
index 5f57c78e..00000000
--- a/sys-apps/man/man-1.6g-r3.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Martin V\"ath and Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit l10n prefix toolchain-funcs
-
-DESCRIPTION="Standard commands to read man pages"
-HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
-SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cache +lzma nls selinux"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="acct-group/man
- acct-user/man
- >=sys-apps/groff-1.19.2-r1
- !sys-apps/man-db
- !<app-arch/lzma-4.63
- lzma? ( app-arch/xz-utils )
- selinux? ( sec-policy/selinux-makewhatis )"
-
-src_prepare() {
- eapply -p0 "${FILESDIR}"/man-1.6f-man2html-compression-2.patch
- eapply -p0 "${FILESDIR}"/man-1.6-cross-compile.patch
- eapply "${FILESDIR}"/man-1.6f-unicode.patch #146315
- eapply "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch
- eapply "${FILESDIR}"/man-1.5m2-apropos.patch
- eapply "${FILESDIR}"/man-1.6g-fbsd.patch #138123
- eapply -p0 "${FILESDIR}"/man-1.6e-headers.patch
- eapply "${FILESDIR}"/man-1.6f-so-search-2.patch
- eapply -p0 "${FILESDIR}"/man-1.6g-compress.patch #205147
- eapply "${FILESDIR}"/man-1.6f-parallel-build.patch #207148 #258916
- eapply "${FILESDIR}"/man-1.6g-xz.patch #302380
- eapply "${FILESDIR}"/man-1.6f-makewhatis-compression-cleanup.patch #331979
- eapply "${FILESDIR}"/man-1.6g-echo-escape.patch #523874
- eapply "${FILESDIR}"/man-1.6g-gawk-5.patch #683494
- # make sure `less` handles escape sequences #287183
- sed -i -e '/^DEFAULTLESSOPT=/s:"$:R":' configure
- default
-}
-
-echoit() { echo "$@" ; "$@" ; }
-src_configure() {
- local mylang=
- strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ })
-
- unset NLSPATH #175258
-
- tc-export CC BUILD_CC
-
- if use nls ; then
- if [[ -z ${LINGUAS} ]] ; then
- mylang="all"
- else
- mylang="${LINGUAS// /,}"
- fi
- else
- mylang="none"
- fi
- export COMPRESS
- if use lzma ; then
- COMPRESS="${EPREFIX}"/usr/bin/xz
- else
- COMPRESS="${EPREFIX}"/bin/bzip2
- fi
-
- if [[ -n ${EPREFIX} ]]; then
- hprefixify configure || die
- sed -i \
- -e "s/man_user=root/man_user=$(id -u)/" \
- -e "s/man_group=man/man_group=$(id -g)/" \
- configure || die "Failed to disable suid/sgid options for man"
- sed -i -e 's:/usr/bin:@bindir@:' man2html/Makefile.in || die
- fi
-
- echoit \
- ./configure \
- -bindir="${EPREFIX}"/usr/bin \
- -confdir="${EPREFIX}"/etc \
- +sgid +fhs \
- +lang ${mylang} \
- || die "configure failed"
-}
-
-src_install() {
- unset NLSPATH #175258
-
- emake PREFIX="${ED}" install || die "make install failed"
- dosym man /usr/bin/manpath
-
- dodoc LSM README* TODO
-
- # makewhatis only adds man-pages from the last 24hrs
- exeinto /etc/cron.daily
- newexe "${FILESDIR}"/makewhatis.cron makewhatis
-
- keepdir /var/cache/man
- [[ -z ${EPREFIX} ]] && diropts -m0775 -g man
- local mansects=$(grep ^MANSECT "${ED}"/etc/man.conf | cut -f2-)
- for x in ${mansects//:/ } ; do
- keepdir /var/cache/man/cat${x}
- done
-}
-
-pkg_postinst() {
- local files f i
- einfo "Forcing sane permissions onto ${ROOT}/var/cache/man (Bug #40322)"
- if use cache ; then
- chown -R root:man "${EROOT}"/var/cache/man
- chmod -R g+w "${EROOT}"/var/cache/man
- [[ -e ${EROOT}/var/cache/man/whatis ]] \
- && chown root:0 "${EROOT}"/var/cache/man/whatis
- elif test -d "${EROOT}"/var/cache/man ; then
- rm -rfv -- "${EROOT}"/var/cache/man
- fi
-
- echo
-
- for f in "${EROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} ; do
- case ${f} in
- */etc/cron.daily/makewhatis)
- continue;;
- esac
- test -r "${f}" || continue
- case $(md5sum -- "${f}") in
- "8b2016cc778ed4e2570b912c0f420266 "*)
- rm -f -- "${f}";;
- esac
- done
- files=
- i=false
- for f in "${EROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} ; do
- test -r "${f}" || continue
- if [ -z "${files}" ] ; then
- files=${f}
- else
- files="${files} ${f}"
- i=:
- fi
- done
- if ${i} ; then
- ewarn "You have multiple makewhatis cron files installed."
- ewarn "You might want to delete all but one of these:"
- ewarn "${files}"
- fi
-}
diff --git a/sys-apps/man/metadata.xml b/sys-apps/man/metadata.xml
deleted file mode 100644
index 901f1d3b..00000000
--- a/sys-apps/man/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
-</maintainer>
-<use>
-<flag name="cache">Use cache directory. Superfluous on modern machines</flag>
-</use>
-</pkgmetadata>
diff --git a/sys-apps/openrc-wrapper/ChangeLog b/sys-apps/openrc-wrapper/ChangeLog
new file mode 100644
index 00000000..844c8d50
--- /dev/null
+++ b/sys-apps/openrc-wrapper/ChangeLog
@@ -0,0 +1,53 @@
+# ChangeLog for sys-fs/openrc-wrapper
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*openrc-wrapper-1.7 (16 Jun 2015)
+
+ 16 Jun 2015 Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*openrc-wrapper-1.6 (01 Jun 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 01 Jun 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*openrc-wrapper-1.5 (12 Mar 2014)
+
+ 14 Mar 2014; Martin Väth <martin@mvath.de>:
+ Add dependency on gentoo-functions to guarantee a nice output
+
+ 12 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support /lib/gentoo/functions.sh
+
+*openrc-wrapper-1.4 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*openrc-wrapper-1.3 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Shebang care
+
+*openrc-wrapper-1.2 (14 Sep 2013)
+
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*openrc-wrapper-1.1-r1 (24 Aug 2013)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 24 Aug 2013; Martin Väth <martin@mvath.de>:
+ Fix blockers
+
+*openrc-wrapper-1.1 (22 Aug 2013)
+
+ 22 Aug 2013; Martin Väth <martin@mvath.de>:
+ Split script from squash_dir project as it is of independent interest,
+ and the former has squashmount as a successor
diff --git a/sys-apps/openrc-wrapper/Manifest b/sys-apps/openrc-wrapper/Manifest
index dd55f266..2787170d 100644
--- a/sys-apps/openrc-wrapper/Manifest
+++ b/sys-apps/openrc-wrapper/Manifest
@@ -1 +1 @@
-DIST openrc-wrapper-2.4.tar.gz 3626 SHA512 8f53f5eb3feefa393cb61d7e892a8ce3a47f467149b3332d04b0b0a478587f7da42602b837f018b1c9b23440ba65f18c5ea5b25299911355a4a4eff1eeaf1c4d
+DIST openrc-wrapper-1.7.tar.gz 2432 SHA256 4bef51a81461772b277ca9df8dd3295043c0a61a976cef39e401cf26ce3b8c15 SHA512 f825e2a44b613c372948c12c83183a95723bb99ceb86e24739eb10f3b24dc3768d542f4410db6cf1f2ad44559c20eba2cb2a70ecd038f5b3e9d8877008b0e488 WHIRLPOOL 37a0685562a2a0f546927c2ec61807e8ef94d01825ae5c6e8a25c7c361e5854765e3b791b00925f1ff11c54d683f1ac649b8b6aced8d2a32fea630e1e6a3d583
diff --git a/sys-apps/openrc-wrapper/metadata.xml b/sys-apps/openrc-wrapper/metadata.xml
index 18a930bc..db6be5a2 100644
--- a/sys-apps/openrc-wrapper/metadata.xml
+++ b/sys-apps/openrc-wrapper/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/sys-apps/openrc-wrapper/openrc-wrapper-2.4.ebuild b/sys-apps/openrc-wrapper/openrc-wrapper-1.7.ebuild
index 63f6b5cb..88be0ecc 100644
--- a/sys-apps/openrc-wrapper/openrc-wrapper-2.4.ebuild
+++ b/sys-apps/openrc-wrapper/openrc-wrapper-1.7.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2013-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
-inherit systemd
+inherit eutils systemd
DESCRIPTION="Use openrc init scripts with systemd or other init systems"
HOMEPAGE="https://github.com/vaeth/openrc-wrapper"
@@ -12,29 +13,23 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="split-usr"
+IUSE=""
DEPEND="!!<sys-fs/squash_dir-3.2"
# the last dependency is not really needed, but without it the output is ugly,
# and the costs are really not high: sys-apps/gentoo-functions is tiny
RDEPEND="${DEPEND}
|| ( sys-apps/gentoo-functions sys-apps/openrc )"
+IUSE=""
src_prepare() {
- sed -i -e "s'ExecStart=/bin'ExecStart=$(get_usr)/bin'" \
- "${S}"/systemd/system/*.service
- default
+ epatch_user
}
src_install() {
- dodoc README.md
+ dodoc README
+ dobin bin/*
systemd_dounit systemd/system/*
insinto /usr/share/zsh/site-functions
doins zsh/*
- into $(get_usr)/
- dobin bin/*
-}
-
-get_usr() {
- use split-usr || echo /usr
}
diff --git a/sys-apps/paxopen/Manifest b/sys-apps/paxopen/Manifest
deleted file mode 100644
index fa3ccc38..00000000
--- a/sys-apps/paxopen/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST paxopen-1.2.tar.gz 1965 SHA512 8445abccb55a4d6e3ad4787b878e07aaa99897048f728988c2912240bd6312cbf57dc7528772b172232b21de3ac57af3fcde0b8ea63363980088cd91d44aef55
diff --git a/sys-apps/paxopen/metadata.xml b/sys-apps/paxopen/metadata.xml
deleted file mode 100644
index 601aa8ba..00000000
--- a/sys-apps/paxopen/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <bugs-to>mailto:martin@mvath.de</bugs-to>
- <remote-id type="github">vaeth/paxopen</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sys-apps/paxopen/paxopen-1.2.ebuild b/sys-apps/paxopen/paxopen-1.2.ebuild
deleted file mode 100644
index 9857932c..00000000
--- a/sys-apps/paxopen/paxopen-1.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2016-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="A wrapper script to set PAX kernel variables to an insecure/safe state"
-HOMEPAGE="https://github.com/vaeth/paxopen/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_install() {
- dosbin bin/*
- insinto /usr/share/zsh/site-functions
- doins zsh/*
-}
diff --git a/sys-apps/schedule/ChangeLog b/sys-apps/schedule/ChangeLog
new file mode 100644
index 00000000..3d6efec7
--- /dev/null
+++ b/sys-apps/schedule/ChangeLog
@@ -0,0 +1,230 @@
+# ChangeLog for sys-apps/schedule
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*starter-7.2.0 (02 Oct 2015)
+
+ 02 Oct 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-7.1.1 (19 Aug 2015)
+
+ 19 Aug 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-7.1.0 (07 Aug 2015)
+
+ 07 Aug 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix loglevel 'warning'. Security fix!
+
+*starter-7.0.5 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-7.0.4 (21 Mar 2015)
+
+ 21 Mar 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix openrc init
+
+*starter-7.0.3 (17 Mar 2015)
+
+ 17 Mar 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-7.0.2 (11 Jan 2015)
+
+ 11 Jan 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-7.0.1 (25 Dec 2014)
+
+ 27 Dec 2014; Martin Väth <martin@mvath.de>:
+ Add blocker to <openrc-0.13
+
+ 25 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-7.0.0 (14 Nov 2014)
+
+ 14 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-6.3.1 (11 Nov 2014)
+
+ 11 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-6.3.0 (07 Nov 2014)
+
+ 07 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Record/display time
+
+*starter-6.2.1 (23 Oct 2014)
+
+ 23 Oct 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-6.2.0 (21 Oct 2014)
+
+ 21 Oct 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. schedule.socket works now
+
+*starter-6.1.0 (07 Oct 2014)
+
+ 07 Oct 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+ New user/group schedule, /etc/schedule.password
+
+*starter-6.0.2 (20 Sep 2014)
+
+ 20 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-6.0.1 (13 Sep 2014)
+
+ 13 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. More precise perl deps
+
+*starter-6.0 (11 Sep 2014)
+
+ 11 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-5.3 (11 Sep 2014)
+
+ 11 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-5.2 (04 Sep 2014)
+
+ 04 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-5.1 (04 Sep 2014)
+
+ 04 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump
+
+*starter-5.0 (02 Sep 2014)
+
+ 02 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Add schedule-tmux
+
+*starter-4.2 (29 Aug 2014)
+
+ 29 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix manpage handling
+
+*starter-4.1 (23 Aug 2014)
+
+ 23 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-4.0 (20 Aug 2014)
+
+ 20 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuilds
+
+*starter-3.1 (15 Aug 2014)
+
+ 15 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-3.0 (14 Aug 2014)
+
+ 14 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support job address, job address ranges
+
+*starter-2.2 (12 Aug 2014)
+
+ 12 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support nonpositive numbers in job ranges
+
+*starter-2.1 (11 Aug 2014)
+
+ 11 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump. Support static job numbers, race-free parallel
+
+*starter-1.1 (10 Aug 2014)
+
+ 10 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support --bg --daemon. Essential bugfixes
+
+*starter-1.0 (09 Aug 2014)
+
+ 09 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Strengthen encryption
+
+*starter-0.15 (08 Aug 2014)
+
+ 08 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Add recommendations for encryption
+
+*starter-0.14 (02 Aug 2014)
+
+ 02 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-0.13 (29 Jul 2014)
+
+ 29 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-0.12 (27 Jul 2014)
+
+ 27 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-0.11 (26 Jul 2014)
+
+ 26 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-0.10 (25 Jul 2014)
+
+ 25 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-0.9 (24 Jul 2014)
+
+ 24 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-0.8 (19 Jul 2014)
+
+ 20 Jul 2014; Martin Väth <martin@mvath.de>:
+ List all dependencies
+
+ 19 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-0.7 (18 Jul 2014)
+
+ 18 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-0.6 (17 Jul 2014)
+
+ 17 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-0.5 (16 Jul 2014)
+
+ 16 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-0.4 (15 Jul 2014)
+
+ 15 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-0.3 (14 Jul 2014)
+
+ 14 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-0.1 (13 Jul 2014)
+
+ 13 Jul 2014; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/sys-apps/schedule/Manifest b/sys-apps/schedule/Manifest
index 365b71f3..5d2df89e 100644
--- a/sys-apps/schedule/Manifest
+++ b/sys-apps/schedule/Manifest
@@ -1 +1 @@
-DIST schedule-8.0.1.tar.gz 50297 SHA512 725c4200d84bf98d67bed2e07951f63c6cb9136212dfe854de81ea4f5ad4950d94a9461f48f86b484609afc5fad7727d37684bbfd64c8496c4a6dc4f0259f6c8
+DIST schedule-7.2.0.tar.gz 46509 SHA256 8da9d1769d18553803d9e1eacde024382ea57210004fcc6bf80c48baedb453b2 SHA512 ee081b820caf83e309623fc89612170848b48ed682038850de59db3b1444bbe6a9273ff7675307662fa83cdf374f3dbe80ebda0076227e2abf3cc1ddd2c8bf86 WHIRLPOOL 4af007aed84d00aee3565eab3b36ce30cc2570f6d22f7da62d27f0cf663d09d4ecc58f570d9db6ebd66fa26635c0b3d0bdc4b01e72ebfb5170c87c4cf7beab86
diff --git a/sys-apps/schedule/metadata.xml b/sys-apps/schedule/metadata.xml
index cda2281e..98f77653 100644
--- a/sys-apps/schedule/metadata.xml
+++ b/sys-apps/schedule/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/sys-apps/schedule/schedule-8.0.1.ebuild b/sys-apps/schedule/schedule-7.2.0.ebuild
index 81f6e78d..c792ef6b 100644
--- a/sys-apps/schedule/schedule-8.0.1.ebuild
+++ b/sys-apps/schedule/schedule-7.2.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2014-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
-inherit readme.gentoo-r1 user systemd
+inherit eutils readme.gentoo user systemd
DESCRIPTION="script to schedule jobs in a multiuser multitasking environment"
HOMEPAGE="https://github.com/vaeth/schedule/"
@@ -11,17 +12,10 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-
-# These should really depend on USE-flags but must not by policy.
-# Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283
-OPTIONAL_RDEPEND="|| ( >=dev-lang/perl-5.14 virtual/perl-Term-ANSIColor )
-dev-perl/Crypt-Rijndael"
-
-RDEPEND=">=dev-lang/perl-5.12
- !<sys-apps/openrc-0.13
- ${OPTIONAL_RDEPEND}"
+RDEPEND="!<sys-apps/openrc-0.13
+ >=dev-lang/perl-5.12"
# || ( >=dev-lang/perl-5.10.1 >=virtual/perl-version-0.77 )
# || ( >=dev-lang/perl-5.1 virtual/perl-File-Path )
# || ( >=dev-lang/perl-5.9.4 virtual/perl-File-Spec-3.0 )
@@ -46,14 +40,14 @@ src_prepare() {
-e 's"^/usr/share/schedule"${EPREFIX}/usr/share/${PN}"' \
-e '/^use FindBin;/,/^\}$/d' \
-- bin/* || die
- default
+ epatch_user
}
src_install() {
dobin bin/*
- dodoc README.md ChangeLog
- insinto /usr
- doins -r share
+ dodoc README ChangeLog
+ insinto "/usr/share/${PN}"
+ doins -r lib/*
doinitd openrc/init.d/*
doconfd openrc/conf.d/*
systemd_dounit systemd/system/*
@@ -65,7 +59,6 @@ src_install() {
umask 027
: >"${ED}/etc/schedule.password"
)
- readme.gentoo_create_doc
}
generate_password() (
@@ -76,6 +69,8 @@ generate_password() (
)
pkg_postinst() {
+ optfeature "colored output" '>=dev-lang/perl-5.14' 'virtual/perl-Term-ANSIColor'
+ optfeature "encryption support" 'dev-perl/Crypt-Rijndael'
if ! use prefix
then enewgroup schedule
enewuser schedule -1 -1 -1 schedule
@@ -89,5 +84,4 @@ pkg_postinst() {
else ewarn "failed to generate ${EPREFIX}/etc/schedule.password"
fi
fi
- readme.gentoo_print_elog
}
diff --git a/sys-apps/starter/ChangeLog b/sys-apps/starter/ChangeLog
new file mode 100644
index 00000000..859d2291
--- /dev/null
+++ b/sys-apps/starter/ChangeLog
@@ -0,0 +1,99 @@
+# ChangeLog for sys-apps/starter
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*starter-2.15 (12 Jul 2015)
+
+ 12 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-2.14 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-2.13 (29 Jul 2014)
+
+ 29 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-2.12 (30 Mar 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 30 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-2.11-r1 (17 Dec 2013)
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix sh path
+
+*starter-2.11 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-2.10 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild Shebang care
+
+*starter-2.9 (17 Nov 2012)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 17 Nov 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Improve zsh completion
+
+ 09 Jun 2013; Martin Väth <martin@mvath.de>:
+ Make runtitle mandatory
+
+*starter-2.8 (11 Sep 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 11 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-2.6 (07 May 2012)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-2.5 (04 May 2012)
+
+ 04 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-2.4 (08 Apr 2012)
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 08 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-2.3 (28 Feb 2012)
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*starter-2.2 (31 Jan 2012)
+
+ 31 Jan 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. More secure defaults.
+
+*starter-2.0 (30 Jan 2012)
+
+ 30 Jan 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/sys-apps/starter/Manifest b/sys-apps/starter/Manifest
index bc504fae..2fbd7d32 100644
--- a/sys-apps/starter/Manifest
+++ b/sys-apps/starter/Manifest
@@ -1 +1 @@
-DIST starter-3.0.tar.gz 6621 SHA512 0000b9c8a60ec5429787c1f14ec44cd961e2dfb4ff672f6a829ab85bae1af5c87ecef1df7a1a4cb6145a5b7a235534c9456ae8a55647131faaf4eaa4ba9a373a
+DIST starter-2.15.tar.gz 6504 SHA256 ee2b600f691970c6da38d15d279eacce10396a7abf66cc260cb493d49b60d95a SHA512 0ab683698949021fc58647c8adc736324a1f38ec0d6e57d5a3c269f294b04fd73f1058e37ee8bd546a4eff2147d6fcc12e363ea99acaca1e8964ca5fb0bb3ce0 WHIRLPOOL 0899e6b2301f549c8514597b025f8a686f77de538ea2ab520a2a63d39fe18c522ebea995b315e2dd20dbe783f8ab82036392988e7f1303f251abfa91275715e9
diff --git a/sys-apps/starter/metadata.xml b/sys-apps/starter/metadata.xml
index e4597c25..9140c236 100644
--- a/sys-apps/starter/metadata.xml
+++ b/sys-apps/starter/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/sys-apps/starter/starter-3.0.ebuild b/sys-apps/starter/starter-2.15.ebuild
index 77cdc9f9..eeeae225 100644
--- a/sys-apps/starter/starter-3.0.ebuild
+++ b/sys-apps/starter/starter-2.15.ebuild
@@ -1,8 +1,10 @@
-# Copyright 2012-2018 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
+inherit eutils
DESCRIPTION="POSIX shell script and function to schedule commands"
HOMEPAGE="https://github.com/vaeth/starter/"
@@ -10,9 +12,9 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND=">=app-shells/push-2.0-r2
+RDEPEND="app-shells/push
>=app-shells/runtitle-2.3"
DEPEND=""
@@ -20,14 +22,14 @@ src_prepare() {
use prefix || sed -i \
-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-- bin/* || die
- default
+ epatch_user
}
src_install() {
local i
insinto /usr/bin
for i in bin/*
- do if test -h "${i}"
+ do if test -h "${i}" || ! test -x "${i}"
then doins "${i}"
else dobin "${i}"
fi
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
deleted file mode 100644
index e973c9c4..00000000
--- a/sys-block/parted/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST parted-2.4.tar.xz 1516412 SHA512 1f7ac11079981b176c1157bd6d858e67394bb4be9b622f91d4e78412a41c696809ed60912b8b94f3a2a924b2f43638dd5d6cb6f4c28e8dc63a2d421380cb5477
diff --git a/sys-block/parted/files/parted-2.4-glibc-2.28.patch b/sys-block/parted/files/parted-2.4-glibc-2.28.patch
deleted file mode 100644
index 7c00ac2e..00000000
--- a/sys-block/parted/files/parted-2.4-glibc-2.28.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-fix build failure against glibc-2.28
-
-https://bugs.gentoo.org/663928
-
-Adopted gnulib's upstream patch:
-
-From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Mon, 5 Mar 2018 10:56:29 -0800
-Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem reported by Daniel P. Berrangé in:
-https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
-* lib/fflush.c (clear_ungetc_buffer_preserving_position)
-(disable_seek_optimization, rpl_fflush):
-* lib/fpurge.c (fpurge):
-* lib/freadahead.c (freadahead):
-* lib/freading.c (freading):
-* lib/fseeko.c (fseeko):
-* lib/fseterr.c (fseterr):
-Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
-* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
-Define if not already defined.
----
- lib/fflush.c | 6 +++---
- lib/fpurge.c | 2 +-
- lib/freading.c | 2 +-
- lib/fseeko.c | 4 ++--
- lib/fseterr.c | 2 +-
- lib/stdio-impl.h | 6 ++++++
-
---- a/lib/fflush.c
-+++ b/lib/fflush.c
-@@ -33,7 +33,7 @@
- #undef fflush
-
-
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-
- /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
- static void
-@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
- if (stream == NULL || ! freading (stream))
- return fflush (stream);
-
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-
- clear_ungetc_buffer_preserving_position (stream);
-
---- a/lib/fpurge.c
-+++ b/lib/fpurge.c
-@@ -62,7 +62,7 @@ fpurge (FILE *fp)
- /* Most systems provide FILE as a struct and the necessary bitmask in
- <stdio.h>, because they need it for implementing getc() and putc() as
- fast macros. */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- fp->_IO_read_end = fp->_IO_read_ptr;
- fp->_IO_write_ptr = fp->_IO_write_base;
- /* Avoid memory leak when there is an active ungetc buffer. */
---- a/lib/freading.c
-+++ b/lib/freading.c
-@@ -31,7 +31,7 @@ freading (FILE *fp)
- /* Most systems provide FILE as a struct and the necessary bitmask in
- <stdio.h>, because they need it for implementing getc() and putc() as
- fast macros. */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- return ((fp->_flags & _IO_NO_WRITES) != 0
- || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
- && fp->_IO_read_base != NULL));
---- a/lib/fseeko.c
-+++ b/lib/fseeko.c
-@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
- #endif
-
- /* These tests are based on fpurge.c. */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- if (fp->_IO_read_end == fp->_IO_read_ptr
- && fp->_IO_write_ptr == fp->_IO_write_base
- && fp->_IO_save_base == NULL)
-@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
- return -1;
- }
-
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- fp->_flags &= ~_IO_EOF_SEEN;
- fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
---- a/lib/stdio-impl.h
-+++ b/lib/stdio-impl.h
-@@ -18,6 +18,12 @@
- the same implementation of stdio extension API, except that some fields
- have different naming conventions, or their access requires some casts. */
-
-+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
-+ problem by defining it ourselves. FIXME: Do not rely on glibc
-+ internals. */
-+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-+# define _IO_IN_BACKUP 0x100
-+#endif
-
- /* BSD stdio derived implementations. */
-
---
-2.19.1
-
diff --git a/sys-block/parted/files/parted-2.4-no-gets.patch b/sys-block/parted/files/parted-2.4-no-gets.patch
deleted file mode 100644
index efa6e00b..00000000
--- a/sys-block/parted/files/parted-2.4-no-gets.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -735,7 +735,6 @@
- /* It is very rare that the developer ever has full control of stdin,
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-
-
diff --git a/sys-block/parted/files/parted-2.4-readline.patch b/sys-block/parted/files/parted-2.4-readline.patch
deleted file mode 100644
index 5873ed1e..00000000
--- a/sys-block/parted/files/parted-2.4-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/parted/ui.c
-+++ b/parted/ui.c
-@@ -1440,7 +1440,7 @@
- #ifdef HAVE_LIBREADLINE
- if (!opt_script_mode) {
- rl_initialize ();
-- rl_attempted_completion_function = (CPPFunction*) complete_function;
-+ rl_attempted_completion_function = (rl_completion_func_t*) complete_function;
- readline_state.in_readline = 0;
- }
- #endif
diff --git a/sys-block/parted/files/parted-3.2-sysmacros.patch b/sys-block/parted/files/parted-3.2-sysmacros.patch
deleted file mode 100644
index a29e7619..00000000
--- a/sys-block/parted/files/parted-3.2-sysmacros.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/580022
-
-From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 21 Jun 2016 15:01:08 -0400
-Subject: [PATCH] include sysmacros.h for major/minor/makedev
-
-Linux C libs are moving away from including this header implicitly via
-sys/types.h, so include it explicitly.
----
- libparted/arch/linux.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
-index 326b95619d31..e5c168be3c68 100644
---- a/libparted/arch/linux.c
-+++ b/libparted/arch/linux.c
-@@ -37,6 +37,7 @@
- #include <dirent.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/utsname.h> /* for uname() */
- #include <scsi/scsi.h>
---
-2.8.2
-
diff --git a/sys-block/parted/metadata.xml b/sys-block/parted/metadata.xml
deleted file mode 100644
index 5e69e841..00000000
--- a/sys-block/parted/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- <description>maintainer of the slot in the mv overlay</description>
- </maintainer>
- <maintainer type="project">
- <email>livecd@gentoo.org</email>
- <name>Gentoo LiveCD Project</name>
- </maintainer>
- <use>
- <flag name="device-mapper">
- Enable device-mapper support from <pkg>sys-fs/lvm2</pkg> in parted
- </flag>
- <flag name="debug">
- Enable debugging as encouraged by upstream: [The default configuration]
- includes --enable-debug (by default), which contains many assertions.
- Obviously, these "waste" space, but in the past, they have caught
- potentially dangerous bugs before they would have done damage, so we think
- it's worth it. Also, it means we get more bug reports ;)
- </flag>
- <flag name="standalone">
- Install a standalone version which provides all headers and binaries
- which collide with sys-block/parted:0. If this flag is not set,
- sys-block/parted:0 is pulled in to provide the non-installed headers
- and binaries.
- </flag>
- </use>
-</pkgmetadata>
diff --git a/sys-block/parted/parted-2.4-r3.ebuild b/sys-block/parted/parted-2.4-r3.ebuild
deleted file mode 100644
index c7936cb2..00000000
--- a/sys-block/parted/parted-2.4-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Martin V\"ath and others
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
-HOMEPAGE="https://www.gnu.org/software/parted"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="+debug device-mapper nls readline selinux standalone static-libs"
-RESTRICT="test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
- >=sys-fs/e2fsprogs-1.27
- >=sys-libs/ncurses-5.2:0=
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- readline? ( >=sys-libs/readline-5.2:0= )
- selinux? ( sys-libs/libselinux )
- standalone? ( !sys-block/parted:0 )
- !standalone? ( sys-block/parted:0 )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-BDEPEND="nls? ( >=sys-devel/gettext-0.12.1-r2 )"
-PATCHES=(
- "${FILESDIR}"/${P}-no-gets.patch
- "${FILESDIR}"/${P}-readline.patch
- "${FILESDIR}"/${P}-glibc-2.28.patch
- "${FILESDIR}"/${PN}-3.2-sysmacros.patch
-)
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_prepare() {
- if ! use standalone; then
- sed -i -e "s/GNU parted/GNU parted2/" "${S}"/configure.ac
- sed -i -e "s/partedinclude_HEADERS/partedinclude_NOINST/" \
- "${S}"/include/parted/Makefile.am || die
- sed -i -e "/SUBDIRS.*=/{s/[[:space:]]*partprobe//}" \
- -e "s/pc_DATA/pc_NOINST/" \
- "${S}"/Makefile.am || die
- sed -i -e "/partprobe.8/d" -e "s/parted[.]8.*/parted2.8/" \
- "${S}"/doc/C/Makefile.am || die
- sed -i -e "s/parted/parted2/g" \
- -e "s/PARTED/PARTED2/g" -e "s/Parted/Parted2/g" \
- "${S}"/doc/parted*.* \
- "${S}"/doc/Makefile.am || die
- mv "${S}"/doc/C/parted{,2}.8 || die
- mv "${S}"/doc/parted{,2}.texi || die
- mv "${S}"/doc/parted{,2}-pt_BR.texi || die
- fi
- default
- use standalone || eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable device-mapper) \
- $(use_enable nls) \
- $(use_enable selinux) \
- $(use_enable static-libs static) \
- $(use_with readline) \
- --disable-Werror \
- --disable-rpath \
- --disable-silent-rules
-}
-
-src_install() {
- default
- if ! use standalone; then
- mv "${ED}"/usr/sbin/parted{,2} || die
- rm "${ED}"/usr/$(get_libdir)/libparted.so || die
- fi
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-block/zram-init/ChangeLog b/sys-block/zram-init/ChangeLog
new file mode 100644
index 00000000..29545ade
--- /dev/null
+++ b/sys-block/zram-init/ChangeLog
@@ -0,0 +1,107 @@
+# ChangeLog for sys-block/zram-init
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*zram-init-3.4 (12 Jul 2015)
+
+ 12 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zram-init-3.3 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zram-init-3.2 (16 Jan 2015)
+
+ 16 Jan 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zram-init-3.1 (25 Dec 2014)
+
+ 27 Dec 2014; Martin Väth <martin@mvath.de>:
+ Add blocker to <openrc-0.13
+
+ 25 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zram-init-3.0 (05 Aug 2014)
+
+ 05 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support parallel streams, algorithm
+
+*zram-init-2.8 (29 Jun 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 29 Jun 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zram-init-2.7 (17 Dec 2013)
+
+ 24 Jan 2014; Martin Väth <martin@mvath.de>:
+ Avoid duplicate installation
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix sh path
+
+*zram-init-2.7 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zram-init-2.6-r1 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Shebang care
+
+*zram-init-2.6 (11 Oct 2013)
+
+ 12 Oct 2013; Martin Väth <martin@mvath.de>:
+ Use readme.gentoo.eclass
+
+ 11 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fixes umounting
+
+*zram-init-2.5 (07 Oct 2013)
+
+ 07 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zram-init-2.4 (06 Oct 2013)
+
+ 06 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*zram-init-2.3 (05 Oct 2013)
+
+ 05 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support further configs and systemd
+
+*zram-init-2.2 (03 Jan 2013)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+*zram-init-2.1 (02 Mar 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 02 Mar 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Changes to github repository
+
+*zram-init-2.0 (08 Feb 2010)
+
+ 08 Feb 2010; Martin Väth <martin@mvath.de>:
+ Complete rewrite. Remove old ChangeLog
diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest
index 2385c673..89e14f58 100644
--- a/sys-block/zram-init/Manifest
+++ b/sys-block/zram-init/Manifest
@@ -1 +1 @@
-DIST zram-init-11.0.tar.gz 21069 SHA512 f11c7ad4e684701ab7c89cb1e859c6ee58ff6795f03b584884f64341d511a8c2de375fc43463318220fab2e16632807d8a13e9b6ac502fa933d406996bf4d115
+DIST zram-init-3.4.tar.gz 5825 SHA256 39e121d209a03a29f98bbb0be47ce666bf6c0ef7185af30f118976fbe68a8788 SHA512 985cbe5dd63c900ce88bf8f8989bc04f982b27104dbc40e9c4cf504310aca335efafba842d801e0b9250e8b6925d063bcd2c555122fc7c7295128687ccd4080f WHIRLPOOL 086426e0f334c500f9dc65273afad1acdbd7696882cd0a9f54f7b27fac347777f8dea0899a2719626648da9dee1c837f6f3ccebd8cf1e1c9dc550624c2eb9416
diff --git a/sys-block/zram-init/metadata.xml b/sys-block/zram-init/metadata.xml
index 90d01fb2..0afc3a02 100644
--- a/sys-block/zram-init/metadata.xml
+++ b/sys-block/zram-init/metadata.xml
@@ -1,14 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
- <description>maintainer of the updates in the mv overlay</description>
- </maintainer>
- <maintainer type="person">
- <email>jauhien@gentoo.org</email>
- <name>Jauhien Piatlicki</name>
</maintainer>
<upstream>
<maintainer>
diff --git a/sys-block/zram-init/zram-init-11.0.ebuild b/sys-block/zram-init/zram-init-11.0.ebuild
deleted file mode 100644
index 71af4e6d..00000000
--- a/sys-block/zram-init/zram-init-11.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2011-2021 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit readme.gentoo-r1 systemd
-RESTRICT="mirror" # until available on gentoo mirrors
-
-DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
-HOMEPAGE="https://github.com/vaeth/zram-init/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="nls split-usr"
-LINGUAS="de fr"
-for i in ${LINGUAS}; do
- IUSE="l10n_${i} ${IUSE}"
-done
-
-BDEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=">=app-shells/push-2.0-r2
- !<sys-apps/openrc-0.13
- nls? ( virtual/libintl )"
-
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel:
- rc-config add zram default
-If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl.
-You might need to modify /etc/modprobe.d/zram.conf"
-
-src_compile() {
- SHEBANG="#!${EPREFIX}$(get_usr)/bin/sh" \
- make MODIFY_SHEBANG=$(usex prefix FALSE TRUE) \
- GETTEXT=$(usex nls TRUE FALSE)
-}
-
-src_install() {
- local i po mani18n
- po=
- mani18n=
- for i in ${LINGUAS}; do
- if eval use "l10n_${i}"; then
- po=${po}${po:+\ }i18n/${i}.po
- mani18n=${mani18n}${mani18n:+\ }${i}
- fi
- done
- make DESTDIR="${D}" \
- PREFIX=/usr BINDIR="${ED}$(get_usr)/sbin" SYSCONFDIR="${EPREFIX}/etc" \
- OPENRC=FALSE SYSTEMD=FALSE MANPAGE=FALSE \
- GETTEXT=$(usex nls TRUE FALSE) PO="${po}" MANI18N="${mani18n}" \
- install
- doinitd openrc/init.d/*
- doconfd openrc/conf.d/*
- systemd_dounit systemd/system/*
- doman man/*
- dodoc AUTHORS ChangeLog README.md
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
-
-get_usr() {
- use split-usr || echo /usr
-}
diff --git a/sys-block/zram-init/zram-init-3.4.ebuild b/sys-block/zram-init/zram-init-3.4.ebuild
new file mode 100644
index 00000000..f5849676
--- /dev/null
+++ b/sys-block/zram-init/zram-init-3.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils readme.gentoo systemd
+
+DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
+HOMEPAGE="https://github.com/vaeth/zram-init/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!<sys-apps/openrc-0.13"
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="To use zram, activate it in your kernel and add it to default runlevel:
+ rc-config add zram default
+If you use systemd enable zram_swap, tmp, and/or var_tmp with systemctl.
+You might need to modify /etc/modprobe.d/zram.conf"
+
+src_prepare() {
+ use prefix || sed -i \
+ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+ -- sbin/* || die
+ epatch_user
+}
+
+src_install() {
+ dosbin sbin/*
+ doinitd openrc/init.d/*
+ doconfd openrc/conf.d/*
+ systemd_dounit systemd/system/*
+ insinto /etc/modprobe.d
+ doins modprobe.d/*
+ insinto /usr/share/zsh/site-functions
+ doins zsh/*
+ readme.gentoo_create_doc
+}
diff --git a/sys-boot/grub-cfg-mv/Manifest b/sys-boot/grub-cfg-mv/Manifest
deleted file mode 100644
index 7f53c03c..00000000
--- a/sys-boot/grub-cfg-mv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST grub-cfg-mv-1.8.tar.gz 4826 SHA512 ed5a7fe6915fd9c62058a4bd0e4ade78f4544fd8d3619dab9bfc2ea15e8c3da540c618d0a7c5ae5527e52cae2a4bf83ed6b1a0c97e8fc53cdd9047be564fe320
diff --git a/sys-boot/grub-cfg-mv/grub-cfg-mv-1.8.ebuild b/sys-boot/grub-cfg-mv/grub-cfg-mv-1.8.ebuild
deleted file mode 100644
index d6d88e74..00000000
--- a/sys-boot/grub-cfg-mv/grub-cfg-mv-1.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2016-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-
-DESCRIPTION="A grub.cfg library/example for GRUB2"
-HOMEPAGE="https://github.com/vaeth/grub-cfg-mv/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_install() {
- insinto /boot/grub
- doins boot/grub/grub-mv.cfg
- newins boot/grub/grub.cfg grub-mv-example.cfg
- dodoc README.md
-}
diff --git a/sys-boot/grub-cfg-mv/metadata.xml b/sys-boot/grub-cfg-mv/metadata.xml
deleted file mode 100644
index 816b5f0b..00000000
--- a/sys-boot/grub-cfg-mv/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <upstream>
- <maintainer>
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
- <bugs-to>mailto:martin@mvath.de</bugs-to>
- <remote-id type="github">vaeth/grub-cfg-mv</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sys-fs/aufs-util/ChangeLog b/sys-fs/aufs-util/ChangeLog
new file mode 100644
index 00000000..111753fa
--- /dev/null
+++ b/sys-fs/aufs-util/ChangeLog
@@ -0,0 +1,36 @@
+# ChangeLog for sys-fs/aufs-util
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Bump to git-r3.eclass. Remove support for aufs2
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5. Bump revision to force correct subslot.
+ include linux/compiler.h to fix compilation issues.
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 06 Nov 2011; Martin Väth <martin@mvath.de>:
+ Use default EGIT_PROJECT name. Call EGIT_REPACK unless offline.
+
+ 09 Sep 2011; Martin Väth <martin@mvath.de>:
+ Port to git-2. Remove support for ESCM_OFLINE/EGIT_OFFLINE:
+ This is named EVCS_OFFLINE in git-2.
+
+ 26 Aug 2011; Martin Väth <martin@mvath.de>:
+ Rename aufs2-util-99999999->aufs-util-99999999.2
+ Add aufs-util-99999999.3 for linux3.0/aufs3
+
+ 20 Jun 2011; Martin Väth <martin@mvath.de>:
+ Improve/fix git handling
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 24 Nov 2010; Martin Väth <martin@mvath.de>:
+ aufs2-util-99999999.ebuild: Initial ebuild.
diff --git a/sys-fs/aufs-util/aufs-util-99999999.ebuild b/sys-fs/aufs-util/aufs-util-99999999.ebuild
new file mode 100644
index 00000000..b4264e15
--- /dev/null
+++ b/sys-fs/aufs-util/aufs-util-99999999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGIT_REPO_URI="git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git"
+EGIT_BRANCH="aufs3.9"
+inherit eutils git-r3 linux-info multilib
+
+DESCRIPTION="Userspace tools for aufs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0/3.9"
+# Since this is a live ebuild, we require ACCEPT_KEYWORDS='**'
+#KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
+IUSE=""
+PROPERTIES="live"
+
+RDEPEND=""
+DEPEND="dev-vcs/git[curl]"
+
+src_prepare() {
+ local i l
+ ln -s "${KERNEL_DIR}"/include local_kernel
+ set -- local_kernel/linux/aufs*.h
+ test -e "${1}" || {
+ eerror "It seems you do not have installed aufs into your kernel tree."
+ die "You might need to emerge >=sys-fs/aufs-99999999::mv"
+ }
+ l="s|/usr/lib|$(get_libdir)|"
+ sed -i -e "1iCFLAGS += -I./local_kernel -include linux/compiler.h" -e "${l}" Makefile || \
+ die "Patching Makefile failed"
+ for i in lib*/Makefile
+ do test -e "${i}" || continue
+ sed -i -e "1iCFLAGS += -I../local_kernel" -e "${l}" "${i}" || \
+ die "Patching ${i} failed"
+ done
+ epatch_user
+}
diff --git a/app-arch/paq8l/metadata.xml b/sys-fs/aufs-util/metadata.xml
index b919c846..73a6d343 100644
--- a/app-arch/paq8l/metadata.xml
+++ b/sys-fs/aufs-util/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/sys-fs/aufs/ChangeLog b/sys-fs/aufs/ChangeLog
new file mode 100644
index 00000000..f926f80d
--- /dev/null
+++ b/sys-fs/aufs/ChangeLog
@@ -0,0 +1,84 @@
+# ChangeLog for sys-fs/aufs
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 14 Sep 2013; Martin Väth <martin@mvath.de>:
+ Bump to git-r3.eclass. Remove support for aufs2
+
+ 17 Dec 2012; Martin Väth <martin@mvath.de>:
+ Add patch for hardened-sources-3.7.0. Improve documentation.
+ Special case of kernel-3.7 branch name.
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5. Bump revision to force correct subslot
+
+ 30 Jul 2012; Martin Väth <martin@mvath.de>:
+ Block sys-fs/aufs{2,3} from the gentoo main tree
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 06 Nov 2011; Martin Väth <martin@mvath.de>:
+ Use default EGIT_PROJECT name. Call EGIT_REPACK unless offline.
+
+ 15 Oct 2011; Martin Väth <martin@mvath.de>:
+ Fix grsecurity-2.2.2.r1.patch to work without grsecurity, and
+ bump to aufs-99999999.3-r1 to push the change.
+
+ 09 Sep 2011; Martin Väth <martin@mvath.de>:
+ Port to git-2. Remove support for ESCM_OFLINE/EGIT_OFFLINE:
+ This is named EVCS_OFFLINE in git-2.
+
+ 26 Aug 2011; Martin Väth <martin@mvath.de>:
+ Rename aufs2-99999999->aufs-99999999.2, default to aufs2.2,
+ and treat GRSECURITYPATCHVER better.
+ Add aufs-99999999.3 for linux3.0 and aufs3.0
+
+ 09 Aug 2011; Martin Väth <martin@mvath.de>:
+ Update patches for grsecurity.
+ Skip patches not named aufs* (unless USE=all-patches is set).
+ Only install the most current grsecurity patch by default.
+
+ 20 Jun 2011; Martin Väth <martin@mvath.de>:
+ Update patches for grsecurity.
+
+ 21 Jan 2011; Martin Väth <martin@mvath.de>:
+ Make git checkout more stable.
+ Apply patches conditionally and more stable (retry after failure).
+ Provide patches for grsecurity (hardened-sources).
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 21 Nov 2010; Martin Väth <martin@mvath.de>:
+ Default to aufs2.1. Do not install broken Kbuild files.
+ Call epatch only once with collected list of patches.
+
+ 23 Aug 2010; Martin Väth <martin@mvath.de>:
+ Fix treatment of EGIT_PRUNE. Bump EAPI.
+
+ 17 Mar 2010; Martin Väth <martin@mvath.de>:
+ Update git dependency according to package move.
+
+ 04 Mar 2010; Martin Väth <martin@mvath.de>:
+ Support ESCM_OFFLINE/EGIT_OFFLINE in the same sense as git.eclass.
+ Output corresponding message only if *_OFFLINE is nonempty.
+
+ 16 Jan 2010; Martin Väth <martin@mvath.de>:
+ Remove patch again since git.eclass is now fixed:
+ http://bugs.gentoo.org/show_bug.cgi?id=299204
+
+ 29 Dec 2009; Martin Väth <martin@mvath.de>:
+ Patch for broken git.eclass 1.33 2009/12/29
+
+ 17 Dec 2009; Martin Väth <martin@mvath.de>:
+ Adapt for new git.eclass 1.32 2009/12/16
+
+ 14 Oct 2009; Martin Väth <martin@mvath.de>:
+ Patch automatically instead of informing the user
+
+ 04 Apr 2009; Martin Väth <martin@mvath.de>:
+ aufs2-99999999.ebuild: Initial ebuild.
diff --git a/sys-fs/aufs/aufs-99999999.ebuild b/sys-fs/aufs/aufs-99999999.ebuild
new file mode 100644
index 00000000..f986d375
--- /dev/null
+++ b/sys-fs/aufs/aufs-99999999.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGIT_REPO_URI="git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git"
+EGIT_BRANCH="aufs3.0"
+inherit eutils git-r3 linux-info
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0/3"
+# Since this is a live ebuild with unstable versions in portage we require
+# that the user unmasks this ebuild with ACCEPT_KEYWORDS='**'
+#KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
+IUSE="kernel-patch all-patches"
+PROPERTIES="live"
+
+RDEPEND="!sys-fs/aufs2
+ !sys-fs/aufs3"
+DEPEND="dev-vcs/git[curl]"
+
+declare -a my_patchlist
+
+fill_my_patchlist() {
+ local i
+ my_patchlist=()
+ for i
+ do case ${i} in
+ *.patch|*.diff)
+ ! test -f "${i}" || my_patchlist+=("${i}");;
+ esac
+ done
+}
+
+apply_my_patch() {
+ local r
+ r=
+ if [ ${#} -gt 1 ]
+ then shift
+ r='-R'
+ fi
+ patch ${r} -p1 --dry-run --force <"${1}" >/dev/null || return
+ einfo "Applying kernel patch ${1}${r:+ reversely}"
+ patch ${r} -p1 --force --no-backup-if-mismatch <"${1}" >/dev/null || {
+ eerror "applying kernel patch ${1}${r:+ reversely} failed."
+ eerror "Since dry run succeeded this is probably a problem with write permissions."
+ die "With USE=-kernel-patch you avoid automatic patching attempts."
+ }
+}
+
+apply_my_patchlist() {
+ local r i
+ r=
+ if [ ${#} -gt 0 ]
+ then shift
+ r='-R'
+ fi
+ set --
+ for i in "${my_patchlist[@]}"
+ do if use all-patches || case "${i}" in
+ aufs*)
+ :;;
+ *)
+ false;;
+ esac
+ then apply_my_patch ${r} "${i}" || set -- "${@}" "${i}"
+ else einfo "Kernel patch ${i} - skipping as all-patches is not set"
+ fi
+ done
+ for i
+ do apply_my_patch ${r} "${i}" || \
+ ewarn "Kernel patch ${i} cannot be${r:+ reverse} applied - skipping."
+ done
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ # kernel version check
+ if kernel_is lt 2 6 26
+ then
+ eerror "${PN} is being developed and tested on linux-2.6.26 and later."
+ eerror "Make sure you have a proper kernel version!"
+ die "Wrong kernel version"
+ fi
+
+ if [ -n "${AUFSBRANCH}" ]
+ then EGIT_BRANCH="${AUFSBRANCH}"
+ else if kernel_is lt 3 0
+ then [ -n "${KV_PATCH}" ] && EGIT_BRANCH="aufs2.2-${KV_PATCH}"
+ else [ -n "${KV_MINOR}" ] && EGIT_BRANCH="aufs${KV_MAJOR}.${KV_MINOR}"
+ fi
+ case ${EGIT_BRANCH} in
+ aufs3.7)
+ EGIT_BRANCH="aufs3.x-rcN";;
+ esac
+ fi
+ elog
+ elog "Using aufs branch: ${EGIT_BRANCH}"
+ elog "If this guess for the branch is wrong, set AUFSBRANCH."
+ elog "For example, to use the aufs3.0 branch for kernel version 3.0, use:"
+ elog " AUFSBRANCH=aufs3.0 emerge -1 aufs"
+ elog
+ elog "To find out names of testing branches you might want to use"
+ elog "( cd ${EGIT_DIR} && git log --decorate --graph --all --full-history )"
+ if [ -n "${EVCS_OFFLINE}" ]
+ then elog
+ elog "Note that it might be necessary in addition to fetch the newest aufs:"
+ elog "Set EVCS_OFFLINE='' in the environment and be online during emerge."
+ fi
+ elog
+
+ use kernel-patch || return 0
+ (
+ set --
+ cd -- "${KV_DIR}" >/dev/null 2>&1 && \
+ fill_my_patchlist *.patch *.diff && apply_my_patchlist -R
+ )
+}
+
+src_prepare() {
+ local i j w v newest all
+ epatch_user
+ all="2.2.0 2.2.1 2.2.2 2.2.2.r1 2.9.1"
+ newest=${all##* }
+ v=
+ for i in ${GRSECURITYPATCHVER-+}
+ do case ${i} in
+ '+')
+ j=${newest};;
+ '*')
+ j=${all};;
+ *)
+ w=:
+ for j in ${all}
+ do [ "${i}" = "${j}" ] && w=false && continue
+ done
+ if ${w}
+ then warn "GRSECURITYPATCHVER contains bad version ${i}"
+ else j="${i}"
+ fi;;
+ esac
+ v="${v} ${j}"
+ done
+ v=${v# }
+ elog
+ elog "Using GRSECURITYPATCHVER: ${v}"
+ elog "If you want other patches, set GRSECURITYPATCHVER to some or more of:"
+ elog "${all} +"
+ elog "The special value + means the newest version (${newest}) and is default."
+ elog "The special value * means all versions."
+ elog
+ for i in ${v}
+ do j="grsecurity-${i}.patch"
+ cp -p -- "${FILESDIR}/${j}" "aufs-${j}" || die "copying ${j} failed"
+ done
+}
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ local i k dk
+ i="Documentation/filesystems/aufs/aufs.5"
+ test -e "${i}" && doman "${i}"
+ k="$(readlink -f -- "${KV_DIR}")" && [ -n "${k}" ] || k="${KV_DIR}"
+ dk="${D}/${k}"
+ dodir "${k}/fs/aufs"
+ cp -pPR -- fs/aufs/* "${dk}/fs/aufs"
+ cp -pPR -- include "${dk}"
+ find "${dk}"/include -name Kbuild -type f -exec rm -v -- '{}' ';'
+ fill_my_patchlist *.patch *.diff
+ cp -pPR -- "${my_patchlist[@]}" "${dk}"
+}
+
+pkg_postinst() {
+ [ "${#my_patchlist[@]}" -eq 0 ] && {
+ cd -- "${KV_DIR}" >/dev/null 2>&1 && fill_my_patchlist *.patch *.diff
+ }
+ if use kernel-patch
+ then cd -- "${KV_DIR}" >/dev/null 2>&1 || die "cannot cd to ${KV_DIR}"
+ apply_my_patchlist
+ elog "Your kernel has been patched. Cleanup and recompile it, selecting"
+ else elog "You will have to apply the following patch to your kernel:"
+ elog " cd ${KV_DIR} && cat ${my_patchlist[*]} | patch -p1 --no-backup-if-mismatch"
+ elog "Then cleanup and recompile your kernel, selecting"
+ fi
+ elog " Filesystems/Miscellaneous Filesystems/aufs"
+ elog "in the configuration phase."
+}
diff --git a/sys-fs/aufs/files/grsecurity-2.2.0.patch b/sys-fs/aufs/files/grsecurity-2.2.0.patch
new file mode 100644
index 00000000..5c805ba7
--- /dev/null
+++ b/sys-fs/aufs/files/grsecurity-2.2.0.patch
@@ -0,0 +1,61 @@
+--- linux/include/linux/fs.h
++++ linux/include/linux/fs.h
+@@ -575,41 +575,41 @@
+ unsigned long, unsigned long);
+
+ struct address_space_operations {
+- int (* const writepage)(struct page *page, struct writeback_control *wbc);
+- int (* const readpage)(struct file *, struct page *);
+- void (* const sync_page)(struct page *);
++ int (*writepage)(struct page *page, struct writeback_control *wbc);
++ int (*readpage)(struct file *, struct page *);
++ void (*sync_page)(struct page *);
+
+ /* Write back some dirty pages from this mapping. */
+- int (* const writepages)(struct address_space *, struct writeback_control *);
++ int (*writepages)(struct address_space *, struct writeback_control *);
+
+ /* Set a page dirty. Return true if this dirtied it */
+- int (* const set_page_dirty)(struct page *page);
++ int (*set_page_dirty)(struct page *page);
+
+- int (* const readpages)(struct file *filp, struct address_space *mapping,
++ int (*readpages)(struct file *filp, struct address_space *mapping,
+ struct list_head *pages, unsigned nr_pages);
+
+- int (* const write_begin)(struct file *, struct address_space *mapping,
++ int (*write_begin)(struct file *, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned flags,
+ struct page **pagep, void **fsdata);
+- int (* const write_end)(struct file *, struct address_space *mapping,
++ int (*write_end)(struct file *, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned copied,
+ struct page *page, void *fsdata);
+
+ /* Unfortunately this kludge is needed for FIBMAP. Don't use it */
+- sector_t (* const bmap)(struct address_space *, sector_t);
+- void (* const invalidatepage) (struct page *, unsigned long);
+- int (* const releasepage) (struct page *, gfp_t);
+- ssize_t (* const direct_IO)(int, struct kiocb *, const struct iovec *iov,
++ sector_t (*bmap)(struct address_space *, sector_t);
++ void (*invalidatepage) (struct page *, unsigned long);
++ int (*releasepage) (struct page *, gfp_t);
++ ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
+ loff_t offset, unsigned long nr_segs);
+- int (* const get_xip_mem)(struct address_space *, pgoff_t, int,
++ int (*get_xip_mem)(struct address_space *, pgoff_t, int,
+ void **, unsigned long *);
+ /* migrate the contents of a page to the specified target */
+- int (* const migratepage) (struct address_space *,
++ int (*migratepage) (struct address_space *,
+ struct page *, struct page *);
+- int (* const launder_page) (struct page *);
+- int (* const is_partially_uptodate) (struct page *, read_descriptor_t *,
++ int (*launder_page) (struct page *);
++ int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
+ unsigned long);
+- int (* const error_remove_page)(struct address_space *, struct page *);
++ int (*error_remove_page)(struct address_space *, struct page *);
+ };
+
+ /*
diff --git a/sys-fs/aufs/files/grsecurity-2.2.1.patch b/sys-fs/aufs/files/grsecurity-2.2.1.patch
new file mode 100644
index 00000000..8396dfd1
--- /dev/null
+++ b/sys-fs/aufs/files/grsecurity-2.2.1.patch
@@ -0,0 +1,63 @@
+--- linux/include/linux/fs.h
++++ linux/include/linux/fs.h
+@@ -583,42 +583,42 @@
+ unsigned long, unsigned long);
+
+ struct address_space_operations {
+- int (* const writepage)(struct page *page, struct writeback_control *wbc);
+- int (* const readpage)(struct file *, struct page *);
+- void (* const sync_page)(struct page *);
++ int (*writepage)(struct page *page, struct writeback_control *wbc);
++ int (*readpage)(struct file *, struct page *);
++ void (*sync_page)(struct page *);
+
+ /* Write back some dirty pages from this mapping. */
+- int (* const writepages)(struct address_space *, struct writeback_control *);
++ int (*writepages)(struct address_space *, struct writeback_control *);
+
+ /* Set a page dirty. Return true if this dirtied it */
+- int (* const set_page_dirty)(struct page *page);
++ int (*set_page_dirty)(struct page *page);
+
+- int (* const readpages)(struct file *filp, struct address_space *mapping,
++ int (*readpages)(struct file *filp, struct address_space *mapping,
+ struct list_head *pages, unsigned nr_pages);
+
+- int (* const write_begin)(struct file *, struct address_space *mapping,
++ int (*write_begin)(struct file *, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned flags,
+ struct page **pagep, void **fsdata);
+- int (* const write_end)(struct file *, struct address_space *mapping,
++ int (*write_end)(struct file *, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned copied,
+ struct page *page, void *fsdata);
+
+ /* Unfortunately this kludge is needed for FIBMAP. Don't use it */
+- sector_t (* const bmap)(struct address_space *, sector_t);
+- void (* const invalidatepage) (struct page *, unsigned long);
+- int (* const releasepage) (struct page *, gfp_t);
+- void (* const freepage)(struct page *);
+- ssize_t (* const direct_IO)(int, struct kiocb *, const struct iovec *iov,
++ sector_t (*bmap)(struct address_space *, sector_t);
++ void (*invalidatepage) (struct page *, unsigned long);
++ int (*releasepage) (struct page *, gfp_t);
++ void (*freepage)(struct page *);
++ ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
+ loff_t offset, unsigned long nr_segs);
+- int (* const get_xip_mem)(struct address_space *, pgoff_t, int,
++ int (*get_xip_mem)(struct address_space *, pgoff_t, int,
+ void **, unsigned long *);
+ /* migrate the contents of a page to the specified target */
+- int (* const migratepage) (struct address_space *,
++ int (*migratepage) (struct address_space *,
+ struct page *, struct page *);
+- int (* const launder_page) (struct page *);
+- int (* const is_partially_uptodate) (struct page *, read_descriptor_t *,
++ int (*launder_page) (struct page *);
++ int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
+ unsigned long);
+- int (* const error_remove_page)(struct address_space *, struct page *);
++ int (*error_remove_page)(struct address_space *, struct page *);
+ };
+
+ /*
diff --git a/sys-fs/aufs/files/grsecurity-2.2.2.patch b/sys-fs/aufs/files/grsecurity-2.2.2.patch
new file mode 100644
index 00000000..9a38594d
--- /dev/null
+++ b/sys-fs/aufs/files/grsecurity-2.2.2.patch
@@ -0,0 +1,61 @@
+--- linux/include/linux/fs.h
++++ linux/include/linux/fs.h
+@@ -580,41 +580,41 @@
+ unsigned long, unsigned long);
+
+ struct address_space_operations {
+- int (* const writepage)(struct page *page, struct writeback_control *wbc);
+- int (* const readpage)(struct file *, struct page *);
++ int (*writepage)(struct page *page, struct writeback_control *wbc);
++ int (*readpage)(struct file *, struct page *);
+
+ /* Write back some dirty pages from this mapping. */
+- int (* const writepages)(struct address_space *, struct writeback_control *);
++ int (*writepages)(struct address_space *, struct writeback_control *);
+
+ /* Set a page dirty. Return true if this dirtied it */
+- int (* const set_page_dirty)(struct page *page);
++ int (*set_page_dirty)(struct page *page);
+
+- int (* const readpages)(struct file *filp, struct address_space *mapping,
++ int (*readpages)(struct file *filp, struct address_space *mapping,
+ struct list_head *pages, unsigned nr_pages);
+
+- int (* const write_begin)(struct file *, struct address_space *mapping,
++ int (*write_begin)(struct file *, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned flags,
+ struct page **pagep, void **fsdata);
+- int (* const write_end)(struct file *, struct address_space *mapping,
++ int (*write_end)(struct file *, struct address_space *mapping,
+ loff_t pos, unsigned len, unsigned copied,
+ struct page *page, void *fsdata);
+
+ /* Unfortunately this kludge is needed for FIBMAP. Don't use it */
+- sector_t (* const bmap)(struct address_space *, sector_t);
+- void (* const invalidatepage) (struct page *, unsigned long);
+- int (* const releasepage) (struct page *, gfp_t);
+- void (* const freepage)(struct page *);
+- ssize_t (* const direct_IO)(int, struct kiocb *, const struct iovec *iov,
++ sector_t (*bmap)(struct address_space *, sector_t);
++ void (*invalidatepage) (struct page *, unsigned long);
++ int (*releasepage) (struct page *, gfp_t);
++ void (*freepage)(struct page *);
++ ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
+ loff_t offset, unsigned long nr_segs);
+- int (* const get_xip_mem)(struct address_space *, pgoff_t, int,
++ int (*get_xip_mem)(struct address_space *, pgoff_t, int,
+ void **, unsigned long *);
+ /* migrate the contents of a page to the specified target */
+- int (* const migratepage) (struct address_space *,
++ int (*migratepage) (struct address_space *,
+ struct page *, struct page *);
+- int (* const launder_page) (struct page *);
+- int (* const is_partially_uptodate) (struct page *, read_descriptor_t *,
++ int (*launder_page) (struct page *);
++ int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
+ unsigned long);
+- int (* const error_remove_page)(struct address_space *, struct page *);
++ int (*error_remove_page)(struct address_space *, struct page *);
+ };
+
+ extern const struct address_space_operations empty_aops;
diff --git a/sys-fs/aufs/files/grsecurity-2.2.2.r1.patch b/sys-fs/aufs/files/grsecurity-2.2.2.r1.patch
new file mode 100644
index 00000000..743b7bb7
--- /dev/null
+++ b/sys-fs/aufs/files/grsecurity-2.2.2.r1.patch
@@ -0,0 +1,15 @@
+--- linux/include/linux/fs.h
++++ linux/include/linux/fs.h
+@@ -619,7 +619,11 @@
+ int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
+ unsigned long);
+ int (*error_remove_page)(struct address_space *, struct page *);
+-};
++}
++#ifdef CONFIG_GRKERNSEC
++__no_const
++#endif
++;
+
+ extern const struct address_space_operations empty_aops;
+
diff --git a/sys-fs/aufs/files/grsecurity-2.9.1.patch b/sys-fs/aufs/files/grsecurity-2.9.1.patch
new file mode 100644
index 00000000..699419fd
--- /dev/null
+++ b/sys-fs/aufs/files/grsecurity-2.9.1.patch
@@ -0,0 +1,15 @@
+--- linux/include/linux/fs.h
++++ linux/include/linux/fs.h
+@@ -385,7 +385,11 @@
+ int (*swap_activate)(struct swap_info_struct *sis, struct file *file,
+ sector_t *span);
+ void (*swap_deactivate)(struct file *file);
+-};
++}
++#ifdef CONFIG_GRKERNSEC
++__no_const
++#endif
++;
+
+ extern const struct address_space_operations empty_aops;
+
diff --git a/media-tv/w_scan/metadata.xml b/sys-fs/aufs/metadata.xml
index b1707910..9632c25e 100644
--- a/media-tv/w_scan/metadata.xml
+++ b/sys-fs/aufs/metadata.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
<use>
- <flag name="plp-id-zero">Apply experimental patch to force plp_id to 0 for DVB-T2. Seems to be necessary at least with some tuners in some regions</flag>
+ <flag name="kernel-patch">Apply the aufs kernel patches instead of just copying them</flag>
+ <flag name="all-patches">Apply all patches - also those which do not start with aufs</flag>
</use>
</pkgmetadata>
diff --git a/sys-fs/emount/ChangeLog b/sys-fs/emount/ChangeLog
new file mode 100644
index 00000000..853eddf3
--- /dev/null
+++ b/sys-fs/emount/ChangeLog
@@ -0,0 +1,79 @@
+# ChangeLog for sys-fs/emount
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*emount-2.8.3 (16 Jun 2015)
+
+ 16 Jun 2016; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*emount-2.8.2 (11 Nov 2014)
+
+ 11 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*emount-2.8.1 (20 Sep 2014)
+
+ 20 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*emount-2.8 (21 Nov 2013)
+
+ 13 Sep 2014; Martin Väth <martin@mvath.de>:
+ More precise perl deps
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*emount-2.7 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*emount-2.6 (18 Aug 2013)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 18 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*emount-2.4 (27 Nov 2012)
+
+ 27 Nov 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*emount-2.3 (13 Jul 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 13 Jul 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*emount-2.2 (03 Jul 2012)
+
+ 03 Jul 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Repeat umount to deal with slave mounts
+
+*emount-2.1-r1 (03 Feb 2012)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 30 Feb 2012; Martin Väth <martin@mvath.de>:
+ Do not install README
+
+*emount-2.1 (31 Jan 2012)
+
+ 31 Jan 2012; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/sys-fs/emount/Manifest b/sys-fs/emount/Manifest
index 8e48a113..c5b78d7e 100644
--- a/sys-fs/emount/Manifest
+++ b/sys-fs/emount/Manifest
@@ -1 +1 @@
-DIST emount-3.0.5.tar.gz 4386 SHA512 4df16ec2198d8c1e6c49330e8525d4c3f58aa72500210299c583267016c98e35619a936452ddff894cc04fc1507d4c114ee04084f3c6f29169dd04ee19c0874e
+DIST emount-2.8.3.tar.gz 3828 SHA256 8431fddd142c3b646d702a4db7c1ad92e1a831bddc2591221b556c13511b9d6b SHA512 f681e3bba219e180c1451d3a3f291ab3f788e973b5cbe3dff8e2cc360352c436a866640e3080c27d70bd70e756714ec4159da24ca4f21a57b411563dc2547cb3 WHIRLPOOL 54ca6c2ce289bd0e5fc24882994fad9516626bcd015f028bfca25e48378b208285d19c123b6a341e6ebcf1bc020a9f8828925d49d198e6c78b24a2d23dc72cec
diff --git a/sys-fs/emount/emount-3.0.5.ebuild b/sys-fs/emount/emount-2.8.3.ebuild
index 4c2e6efe..eb56318c 100644
--- a/sys-fs/emount/emount-3.0.5.ebuild
+++ b/sys-fs/emount/emount-2.8.3.ebuild
@@ -1,25 +1,22 @@
-# Copyright 2012-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
+inherit eutils
-DESCRIPTION="mount/unmount create/remove dm-crypt filesystems according to your /etc/fstab"
+DESCRIPTION="mount/unmount (and create/remove) dm-crypt filesystems according to your /etc/fstab"
HOMEPAGE="https://github.com/vaeth/emount/"
SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-# This should really depend on a USE-flag but must not by policy.
-# Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283
-OPTIONAL_RDEPEND="dev-perl/String-ShellQuote"
-
-RDEPEND=">=dev-lang/perl-5.6.1
- sys-fs/cryptsetup
- ${OPTIONAL_RDEPEND}"
+RDEPEND=">=dev-lang/perl-5.12
+ sys-fs/cryptsetup"
# || ( >=dev-lang/perl-5.6.1 >=virtual/perl-Getopt-Long-2.24 )
# || ( >=dev-lang/perl-5.4.5 virtual/perl-File-Spec )
@@ -27,7 +24,7 @@ src_prepare() {
use prefix || sed -i \
-e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
-- bin/* || die
- default
+ epatch_user
}
src_install() {
diff --git a/sys-fs/emount/metadata.xml b/sys-fs/emount/metadata.xml
index 209ce622..a98c40b2 100644
--- a/sys-fs/emount/metadata.xml
+++ b/sys-fs/emount/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/sys-fs/squash_dir/ChangeLog b/sys-fs/squash_dir/ChangeLog
new file mode 100644
index 00000000..eb422c38
--- /dev/null
+++ b/sys-fs/squash_dir/ChangeLog
@@ -0,0 +1,348 @@
+# ChangeLog for sys-fs/squash_dir
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*squash_dir-13.8 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squash_dir-13.7 (10 Jan 2014)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Declare squash_dir as unmaintained
+
+*squash_dir-13.6 (30 Mar 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 30 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squash_dir-13.5-r1 (17 Dec 2013)
+
+ 15 Mar 2014; Martin Väth <martin@mvath.de>:
+ Use optfeature
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix sh path
+
+*squash_dir-13.5 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squash_dir-13.4-r1 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Shebang care. Avoid deprecated systemd_to_myeconfargs
+
+*squash_dir-13.4 (26 Oct 2013)
+
+ 26 Oct 2013; Martin Väth <martin@mvath.de>:
+ Use readme.gentoo.eclass
+
+*squash_dir-13.3 (31 Aug 2013)
+
+ 12 Oct 2013; Martin Väth <martin@mvath.de>:
+ Use readme.gentoo.eclass
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 31 Aug 2013; Martin Väth <martin@mvath.de>:
+ Recommend alias with noglob
+
+*squash_dir-13.1a (18 Aug 2013)
+
+ 18 Aug 2013; Martin Väth <martin@mvath.de>:
+ Declare sys-fs/squashmount as the official successor of this project
+
+*squash_dir-13.1 (15 Aug 2013)
+
+ 15 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix IGNORETOUCH for subdirectories
+
+*squash_dir-13.0 (13 Aug 2013)
+
+ 14 Aug 2013; Martin Väth <martin@mvath.de>:
+ Simplify EPREFIX usage (without version change)
+
+ 13 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support systemd
+
+*squash_dir-12.10 (04 Aug 2013)
+
+ 04 Auf 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Default to overlayfs
+
+*squash_dir-12.9 (28 Jan 2013)
+
+ 28 Jan 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+ 10 Jun 2013; Martin Väth <martin@mvath.de>:
+ Make runtitle mandatory for USE=zsh-completion, recommend otherwise
+
+*squash_dir-12.8 (08 Jan 2013)
+
+ 14 Jan 2013; Martin Väth <martin@mvath.de>:
+ Improve messages and handling of REPLACING_VERSIONS
+
+ 08 Jan 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squash_dir-12.7 (01 Jan 2013)
+
+ 01 Jan 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support new /etc/conf.d/squash_dir
+
+*squash_dir-12.6 (19 Dec 2012)
+
+ 19 Dec 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squash_dir-12.5 (16 Dec 2012)
+
+ 16 Dec 2012; Martin Väth <martin@mvath.de>:
+ Version bump. ewarn instead of elog, but only if necessary
+ Follow upstream default order
+
+*squash_dir-12.4 (01 Dec 2012)
+
+ 01 Dec 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Provide USE for ORDER default
+ Print logs instead of making hard dependencies
+
+*squash_dir-12.3 (23 Nov 2012)
+
+ 23 Nov 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Provide USE for ORDER default
+
+*squash_dir-12.2 (17 Nov 2012)
+
+ 17 Nov 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Improve zsh completion support
+
+*squash_dir-12.1 (14 Oct 2012)
+
+ 14 Oct 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Changes default of ORDER, see ChangeLog
+
+*squash_dir-12.0 (15 Sep 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 15 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squash_dir-11.16 (15 Sep 2012)
+
+ 15 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix regression in wrapper script
+
+*squash_dir-11.15 (14 Sep 2012)
+
+ 14 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix regression in wrapper script
+
+*squash_dir-11.14 (12 Sep 2012)
+
+ 12 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Succeed if read-only fallback. New: STOP
+
+*squash_dir-11.13 (06 Sep 2012)
+
+ 06 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squash_dir-11.12 (26 Aug 2012)
+
+ 26 Aug 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support overlayfs (untested)
+
+*squash_dir-11.11 (29 Jul 2012)
+
+ 29 Jul 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squash_dir-11.10 (07 May 2012)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squash_dir-11.9 (04 May 2012)
+
+ 04 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squash_dir-11.8 (27 Apr 2012)
+
+ 27 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Check for possibly obsolete /etc/mtab.lock
+
+*squash_dir-11.7 (08 Apr 2012)
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 08 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squash_dir-11.6 (29 Feb 2012)
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 29 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fixes statusline (titlebar) logic
+
+*squash_dir-11.5 (28 Feb 2012)
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squash_dir-11.4 (17 Feb 2012)
+
+ 17 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump. Support soft status line for screen. Care about TERM
+
+*squash_dir-11.3 (03 Nov 2011)
+
+ 03 Nov 2011; Martin Väth <martin@mvath.de>:
+ Version bump. Fix sh -c treatment
+
+*squash_dir-11.2-r1 (31 Oct 2011)
+
+ 31 Oct 2011; Martin Väth <martin@mvath.de>:
+ Change location
+
+*squash_dir-11.2 (29 Oct 2011)
+
+ 29 Oct 2011; Martin Väth <martin@mvath.de>:
+ Version bump. Change location
+
+*squash_dir-11.1 (22 Oct 2011)
+
+ 22 Oct 2011; Martin Väth <martin@mvath.de>:
+ Version bump. Improve squash_dir script (order and alignment)
+
+*squash_dir-11.0 (03 Sep 2011)
+
+ 03 Sep 2011; Martin Väth <martin@mvath.de>:
+ Version bump. Support COMPRESSION, default to xz. Update openrc interface
+
+*squash_dir-10.21 (21 Jan 2011)
+
+ 21 Jan 2011; Martin Väth <martin@mvath.de>:
+ Version bump. Support for titlebar
+
+*squash_dir-10.20 (25 Dec 2010)
+
+ 04 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4
+
+ 25 Dec 2010; Martin Väth <martin@mvath.de>:
+ Version bump. Minor improvements in zsh-completion
+
+*squash_dir-10.19 (21 Dec 2010)
+
+ 21 Dec 2010; Martin Väth <martin@mvath.de>:
+ Version bump. Minor fixes in zsh-completion and configure.ac
+
+*squash_dir-10.18 (11 Dec 2010)
+
+ 11 Dec 2010; Martin Väth <martin@mvath.de>:
+ Version bump. Allow masks in squash_dir wrapper; minor changes in output
+
+*squash_dir-10.17 (09 Dec 2010)
+
+ 09 Dec 2010; Martin Väth <martin@mvath.de>:
+ Version bump. Improve zsh-completion
+
+*squash_dir-10.16 (27 Nov 2010)
+
+ 27 Nov 2010; Martin Väth <martin@mvath.de>:
+ Version bump. Provide zsh-completion
+
+*squash_dir-10.15 (26 Nov 2010)
+
+ 26 Nov 2010; Martin Väth <martin@mvath.de>:
+ Version bump. Do no longer default to MOUNT_AUFS=-i
+
+*squash_dir-10.14 (24 Nov 2010)
+
+ 24 Nov 2010; Martin Väth <martin@mvath.de>:
+ Version bump. Introduce MOUNT_AUFS_OPTS
+ Introduce KILL_FILE and option -k to the squash_dir wrapper script
+
+*squash_dir-10.13 (18 Nov 2010)
+
+ 18 Nov 2010; Martin Väth <martin@mvath.de>:
+ Version bump. Introduce option -n to the squash_dir wrapper script
+
+*squash_dir-10.12 (28 Aug 2010)
+
+ 28 Aug 2010; Martin Väth <martin@mvath.de>:
+ Version bump. Improve output of the squash_dir wrapper script
+
+*squash_dir-10.11 (15 Aug 2010)
+
+ 15 Aug 2010; Martin Väth <martin@mvath.de>:
+ Version bump. Rename squash-dir -> squash_dir
+ Omit spaces in function definition (more compatible)
+
+*squash_dir-10.9 (20 Jul 2010)
+
+ 20 Jul 2010; Martin Väth <martin@mvath.de>:
+ Version bump to provide workaround if readlink command is missing
+
+*squash_dir-10.6 (02 Jun 2010)
+
+ 02 Jun 2010; Martin Väth <martin@mvath.de>:
+ Version bump to support modified syntax of unionfs-fuse
+
+*squash_dir-10.7 (23 Mar 2010)
+
+ 23 May 2010; Martin Väth <martin@mvath.de>:
+ Version bump to fix regression
+
+*squash_dir-10.6 (23 Mar 2010)
+
+ 23 May 2010; Martin Väth <martin@mvath.de>:
+ Version bump. Now "stop" (umount) should be more reliable, and a second
+ "stop" might succeed, making "zap" unnecessary in many cases
+
+*squash_dir-10.5 (20 May 2010)
+
+ 22 May 2010; Martin Väth <martin@mvath.de>:
+ Do not require >=unionfs-fuse-0.25_alpha, but print a message
+ recommending it if an earlier version is used
+
+ 20 May 2010; Martin Väth <martin@mvath.de>:
+ Version bump. Depend on >unionfs-fuse-0.24
+
+*squash_dir-10.4 (28 Apr 2010)
+
+ 28 Apr 2010; Martin Väth <martin@mvath.de>:
+ Version bump because of a stupid automake bug
+
+*squash_dir-10.3 (27 Apr 2010)
+
+ 27 Apr 2010; Martin Väth <martin@mvath.de>:
+ Version bump. Support USE=readonly, making USE=+unionfs-fuse obsolete
+ Remove USE=hack-squash-utils and warn for previous installs
+ Recommend sys-fs/squashfs-tools[progress-redirect] from mv overlay
+
+*squash_dir-10.3 (28 Mar 2010)
+
+ 01 Apr 2010; Martin Väth <martin@mvath.de>:
+ Update tarball without revbump (remove ebuild from tarball)
+
+ 28 Mar 2010; Martin Väth <martin@mvath.de>:
+ import with minor changes from a personal overlay
diff --git a/sys-fs/squash_dir/Manifest b/sys-fs/squash_dir/Manifest
index ae212796..d20b18bb 100644
--- a/sys-fs/squash_dir/Manifest
+++ b/sys-fs/squash_dir/Manifest
@@ -1 +1 @@
-DIST squash_dir-13.14.tar.gz 31903 SHA512 e43f0c06d89f8f604f00e4ed0ec91d271698e5c9cdd5899aa1157ce09205405feaf6a2ff4b3eb15ee1690bf3929669132c5e4cc1640fc8e6ce5c5dac2dec9050
+DIST squash_dir-13.8.tar.gz 31453 SHA256 f123d76ef3d6572ca9e1cb1c239e2fff925cdc8ae65b4047d8b50e351004b5d1 SHA512 0f86f387077a5878612e9847602d1c2e255b79bfcbae5573a6bf413d72ff8b3246b12583ea7050188feb116e55e7704ae9dd2d02df35ce072a2205c1eadfad32 WHIRLPOOL 46bde67d35b7540a28c0a768438a46bec035dbd9c92289e42448de744b054fed4e6bc79a75cea5ab126740a486877896f31b892a661a15bfe8541eb6ed6f9671
diff --git a/sys-fs/squash_dir/metadata.xml b/sys-fs/squash_dir/metadata.xml
index 3afd265b..8bf06804 100644
--- a/sys-fs/squash_dir/metadata.xml
+++ b/sys-fs/squash_dir/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/sys-fs/squash_dir/squash_dir-13.14-r1.ebuild b/sys-fs/squash_dir/squash_dir-13.8.ebuild
index 2519629d..73072d21 100644
--- a/sys-fs/squash_dir/squash_dir-13.14-r1.ebuild
+++ b/sys-fs/squash_dir/squash_dir-13.8.ebuild
@@ -1,11 +1,12 @@
-# Copyright 2010-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
WANT_LIBTOOL=none
AUTOTOOLS_IN_SOURCE_BUILD=true
-inherit autotools linux-info optfeature readme.gentoo-r1 systemd
+inherit autotools autotools-utils eutils linux-info readme.gentoo systemd
DESCRIPTION="Keep directories compressed with squashfs. Useful for portage tree, texmf-dist"
HOMEPAGE="http://forums.gentoo.org/viewtopic-t-465367.html"
@@ -13,17 +14,19 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+#KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS=""
IUSE="aufs overlayfs bundled-openrc-wrapper unionfs-fuse"
-DEPEND="bundled-openrc-wrapper? ( !!sys-apps/openrc-wrapper )"
+BOTHDEPEND="bundled-openrc-wrapper? ( !!sys-apps/openrc-wrapper )"
RDEPEND="sys-fs/squashfs-tools
!bundled-openrc-wrapper? ( sys-apps/openrc-wrapper )
${BOTHDEPEND}
>=app-shells/runtitle-2.3
!<sys-fs/unionfs-fuse-0.25
unionfs-fuse? ( sys-fs/unionfs-fuse )"
-BDEPEND=">=sys-devel/autoconf-2.65"
+DEPEND=">=sys-devel/autoconf-2.65
+ ${BOTHDEPEND}"
DISABLE_AUTOFORMATTING="true"
DOC_CONTENTS="Please adapt ${EPREFIX}/etc/conf.d/${PN} to your needs.
@@ -43,13 +46,13 @@ src_prepare() {
-e "s\":/usr/sbin:/sbin'\":${EPREFIX}/usr/sbin:${EPREFIX}/sbin:/usr/sbin:/sbin'\"" \
-- "sbin/${PN}" || die
sed -i \
- -e "s\"'/lib\"'${EPREFIX}/lib64/rc/bin:${EPREFIX}/lib/rc/bin:/lib\"" \
- -- "bin/openrc-wrapper" || die
+ -e "s\"'/lib/rc/bin:\":'${EPREFIX}/lib/rc/bin:/lib/rc/bin:\"" \
+ -- "sbin/openrc-wrapper" || die
else sed -i \
-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-- bin/* sbin/* || die
fi
- default
+ epatch_user
eautoreconf
}
@@ -58,16 +61,13 @@ src_configure() {
use unionfs-fuse && order=unionfs-fuse
use aufs && order=aufs
use overlayfs && order=overlayfs
- econf --with-zsh-completion \
- "$(use_enable bundled-openrc-wrapper openrc-wrapper)" \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- --bindir=/bind \
+ local myeconfargs=(
+ --with-zsh-completion
+ "$(use_enable bundled-openrc-wrapper openrc-wrapper)"
+ "$(systemd_with_unitdir)"
${order:+"--with-first-order=${order}"}
-}
-
-src_install() {
- default
- readme.gentoo_create_doc
+ )
+ autotools-utils_src_configure
}
linux_config_missing() {
@@ -75,6 +75,7 @@ linux_config_missing() {
}
pkg_postinst() {
+ readme.gentoo_pkg_postinst
local fs=overlayfs
use unionfs-fuse && fs=unionfs-fuse
use aufs && fs=aufs
@@ -87,7 +88,7 @@ pkg_postinst() {
if linux_config_missing 'OVERLAYFS_FS'
then ewarn "To use ${PN} activate overlayfs in your kernel."
ewarn "Unless you use a patched kernel, apply e.g. top patches from some head of"
- ewarn "https://git.kernel.org/?p=linux/kernel/git/mszeredi/vfs.git;a=summary"
+ ewarn "http://git.kernel.org/?p=linux/kernel/git/mszeredi/vfs.git;a=summary"
fi;;
aufs)
if ! has_version sys-fs/aufs3 && ! has_version sys-fs/aufs2 && linux_config_missing 'AUFS_FS'
@@ -96,5 +97,4 @@ pkg_postinst() {
esac
optfeature "improved output" 'sys-fs/squashfs-tools[progress-redirect]'
optfeature "status bar support" 'app-shells/runtitle'
- readme.gentoo_print_elog
}
diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
new file mode 100644
index 00000000..dd6e3d71
--- /dev/null
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -0,0 +1,55 @@
+# ChangeLog for sys-fs/squashfs-tools
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 08 Jun 2014; Martin Väth <martin@mvath.de>:
+ Bump 4.3. Use patch for quiet, unconditionally, instead of progress-stderr.
+ Remove older ebuilds
+
+ 04 May 2014; Martin Väth <martin@mvath.de>:
+ Bump 4.2_p20140119 from tree; update patch; filter -fno-common
+
+ 31 Mar 2013; Martin Väth <martin@mvath.de>:
+ Bump 4.2_p20121216 from tree; update patch
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 17 May 2012; Martin Väth <martin@mvath.de>:
+ Remove REQUIRED_USE; make gzip support mandatory (as it actually is)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Add old LZMA support back (and revbump) as in the main tree.
+ Downgrade revision numbers to match with main tree.
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 11 Feb 2012; Martin Väth <martin@mvath.de>:
+ Rename USE lzma->xz and drop SQUASH_FS_DEFAULT_COMP as in main tree.
+ Use REQUIRED_USE.
+
+ 29 Jan 2012; Martin Väth <martin@mvath.de>:
+ Remove old.
+
+ 31 Mar 2011; Martin Väth <martin@mvath.de>:
+ Bump 4.2 from tree.
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4.
+
+ 25 Sep 2010; Martin Väth <martin@mvath.de>:
+ Bump 4.1 from tree with new patch.
+
+ 23 Aug 2010; Martin Väth <martin@mvath.de>:
+ Bump EAPI.
+
+ 03 Jul 2010; Martin Väth <martin@mvath.de>:
+ Bump all versions to force upgrade.
+
+ 27 Apr 2010; Martin Väth <martin@mvath.de>:
+ Copy from the portage tree to add USE=progress-redirect
+ Clear previous ChangeLog.
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 31d4f430..3b184315 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,2 +1 @@
-DIST squashfs-tools-4.5_alpha20210318.tar.gz 252354 SHA512 43d7a742835f26a9703345cef4156c02c571aed78f67d7110eabf99bd4fb53496fac31a4d5c792e9dddc8efcff84fb9230ef9a12fd2ec18dc6aa68737f18851d
-DIST squashfs-tools_4.3-12.debian.tar.xz 27300 SHA512 13b04a85b1237b5a88a0e01f82b992d98e1b29e3a90a29230607c5232e0188d5402de55a08b6cf78b09f7da2eea05ccc6d15ac0de375af8004c468cfac1fe940
+DIST squashfs4.3.tar.gz 182550 SHA256 0d605512437b1eb800b4736791559295ee5f60177e102e4d4ccd0ee241a5f3f6 SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79 WHIRLPOOL c819f416b34cc46a232b8bc385017774603f81b4a865e6b97208004c183ebad5de7d0f726be444f8cb4e1d450abed9340dab730aec0762407f034e99b39bdc06
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-quiet.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-quiet.patch
new file mode 100644
index 00000000..c4fe57de
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-quiet.patch
@@ -0,0 +1,56 @@
+--- 1/squashfs-tools/mksquashfs.c
++++ 1/squashfs-tools/mksquashfs.c
+@@ -78,6 +78,7 @@
+ #include "process_fragments.h"
+
+ int delete = FALSE;
++int quiet = FALSE;
+ int fd;
+ struct squashfs_super_block sBlk;
+
+@@ -4169,7 +4170,7 @@
+
+ main_thread = pthread_self();
+
+- printf("Parallel mksquashfs: Using %d processor%s\n", processors,
++ quiet || printf("Parallel mksquashfs: Using %d processor%s\n", processors,
+ processors == 1 ? "" : "s");
+
+ /* Restore the signal mask for the main thread */
+@@ -4687,6 +4688,9 @@
+ total_bytes += total_inode_bytes + total_directory_bytes +
+ sizeof(struct squashfs_super_block) + total_xattr_bytes;
+
++ if(quiet)
++ return;
++
+ printf("\n%sSquashfs %d.%d filesystem, %s compressed, data block size"
+ " %d\n", exportable ? "Exportable " : "", SQUASHFS_MAJOR,
+ SQUASHFS_MINOR, comp->name, block_size);
+@@ -5259,6 +5263,9 @@
+ else if(strcmp(argv[i], "-noappend") == 0)
+ delete = TRUE;
+
++ else if(strcmp(argv[i], "-quiet") == 0)
++ quiet = TRUE;
++
+ else if(strcmp(argv[i], "-keep-as-directory") == 0)
+ keep_as_directory = TRUE;
+
+@@ -5351,6 +5358,7 @@
+ "using recovery file <name>\n");
+ ERROR("-no-recovery\t\tdon't generate a recovery "
+ "file\n");
++ ERROR("-quiet\t\t\tno verbose output\n");
+ ERROR("-info\t\t\tprint files written to filesystem\n");
+ ERROR("-no-progress\t\tdon't display the progress "
+ "bar\n");
+@@ -5541,7 +5549,7 @@
+ void *comp_data = compressor_dump_options(comp, block_size,
+ &size);
+
+- printf("Creating %d.%d filesystem on %s, block size %d.\n",
++ quiet || printf("Creating %d.%d filesystem on %s, block size %d.\n",
+ SQUASHFS_MAJOR, SQUASHFS_MINOR, argv[source + 1], block_size);
+
+ /*
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index 0c08467f..1e576aae 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -1,21 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- <description>maintainer of the updates in the mv overlay</description>
- </maintainer>
- <maintainer type="project">
- <email>livecd@gentoo.org</email>
- <name>Gentoo LiveCD Project</name>
- </maintainer>
+ <herd>livecd</herd>
<use>
- <flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
<flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
- <flag name="zstd">Enable support for ZSTD compression using <pkg>app-arch/zstd</pkg> (requires >=linux-4.14 or >=sys-fs/squashfuse-0.1.101_alpha20170917)</flag>
+ <flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
</use>
- <upstream>
- <remote-id type="sourceforge">squashfs</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
new file mode 100644
index 00000000..7703390b
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tool for creating compressed filesystem type squashfs. Patched to support -quiet"
+HOMEPAGE="http://squashfs.sourceforge.net"
+SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~x86"
+IUSE="+xz lzma lz4 lzo xattr"
+
+RDEPEND="
+ sys-libs/zlib
+ !xz? ( !lzo? ( sys-libs/zlib ) )
+ lz4? ( app-arch/lz4 )
+ lzma? ( app-arch/xz-utils )
+ lzo? ( dev-libs/lzo )
+ xattr? ( sys-apps/attr )
+ xz? ( app-arch/xz-utils )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/squashfs${PV}/${PN}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-quiet.patch"
+ epatch_user
+}
+
+src_configure() {
+ # set up make command line variables in EMAKE_SQUASHFS_CONF
+ EMAKE_SQUASHFS_CONF=(
+ $(usex lzma LZMA_XZ_SUPPORT=1 LZMA_XS_SUPPORT=0)
+ $(usex lzo LZO_SUPPORT=1 LZO_SUPPORT=0)
+ $(usex lz4 LZ4_SUPPORT=1 LZ4_SUPPORT=0)
+ $(usex xattr XATTR_SUPPORT=1 XATTR_SUPPORT=0)
+ $(usex xz XZ_SUPPORT=1 XZ_SUPPORT=0)
+ )
+ filter-flags -fno-common
+
+ tc-export CC
+}
+
+src_compile() {
+ emake ${EMAKE_SQUASHFS_CONF[@]}
+}
+
+src_install() {
+ dobin mksquashfs unsquashfs
+ dodoc ../README
+}
+
+pkg_postinst() {
+ ewarn "This version of mksquashfs requires a 2.6.29 kernel or better"
+ use xz &&
+ ewarn "XZ support requires a 2.6.38 kernel or better"
+}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.5_alpha20210318.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.5_alpha20210318.ebuild
deleted file mode 100644
index 6fec6926..00000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.5_alpha20210318.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-PVm=4.3
-DEB_VER="12"
-
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="https://github.com/plougher/squashfs-tools/ https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git http://squashfs.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug lz4 lzma lzo static xattr +xz +zstd"
-EXTRA_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PVm}-${DEB_VER}.debian.tar.xz"
-
-case ${PV} in
-*9999)
- PROPERTIES="live"
- EGIT_REPO_URI="https://github.com/plougher/${PN}"
- inherit git-r3
- SRC_URI=${EXTRA_URI}
- KEYWORDS=""
-src_unpack() {
- default
- git-r3_src_unpack
-};;
-*alpha*)
- RESTRICT="mirror"
- EGIT_COMMIT="248ee1eecad9e7a4425535291699d180b92112f3"
- SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-${EXTRA_URI}"
-src_unpack() {
- default
- mv -- "${WORKDIR}/${PN}-${EGIT_COMMIT}" "${WORKDIR}/${P}"
-};;
-*)
- RESTRICT="mirror"
- SRC_URI="https://github.com/plougher/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-${EXTRA_URI}";;
-esac
-S="${WORKDIR}/${P}/${PN}"
-
-LIB_DEPEND="sys-libs/zlib:=[static-libs(+)]
- lz4? ( app-arch/lz4:=[static-libs(+)] )
- lzma? ( app-arch/xz-utils:=[static-libs(+)] )
- lzo? ( dev-libs/lzo:=[static-libs(+)] )
- xattr? ( sys-apps/attr:=[static-libs(+)] )
- xz? ( app-arch/xz-utils:=[static-libs(+)] )
- zstd? ( >=app-arch/zstd-1.0:=[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
- sed -n -e 's/^#ifndef linux$/#if !defined(linux) && !defined(__GLIBC__)/' \
- -- "${S}"/*.c "${S}"/*.h || die
- default
-}
-
-use10() {
- usex $1 1 0
-}
-
-src_configure() {
- # set up make command line variables in EMAKE_SQUASHFS_CONF
- EMAKE_SQUASHFS_CONF=(
- LZMA_XZ_SUPPORT=$(use10 lzma)
- LZO_SUPPORT=$(use10 lzo)
- LZ4_SUPPORT=$(use10 lz4)
- XATTR_SUPPORT=$(use10 xattr)
- XZ_SUPPORT=$(use10 xz)
- ZSTD_SUPPORT=$(use10 zstd)
- )
- filter-flags -fno-common
-
- tc-export CC
- use debug && append-cppflags -DSQUASHFS_TRACE
- use static && append-ldflags -static
-}
-
-src_compile() {
- emake "${EMAKE_SQUASHFS_CONF[@]}"
-}
-
-src_install() {
- dobin mksquashfs unsquashfs
- cd ..
- dodoc CHANGES README README-4.4 ACKNOWLEDGEMENTS USAGE RELEASE-READMEs/*
- doman "${WORKDIR}"/debian/manpages/*.[0-9]
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
deleted file mode 100644
index 6fec6926..00000000
--- a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-PVm=4.3
-DEB_VER="12"
-
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="https://github.com/plougher/squashfs-tools/ https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git http://squashfs.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug lz4 lzma lzo static xattr +xz +zstd"
-EXTRA_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PVm}-${DEB_VER}.debian.tar.xz"
-
-case ${PV} in
-*9999)
- PROPERTIES="live"
- EGIT_REPO_URI="https://github.com/plougher/${PN}"
- inherit git-r3
- SRC_URI=${EXTRA_URI}
- KEYWORDS=""
-src_unpack() {
- default
- git-r3_src_unpack
-};;
-*alpha*)
- RESTRICT="mirror"
- EGIT_COMMIT="248ee1eecad9e7a4425535291699d180b92112f3"
- SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-${EXTRA_URI}"
-src_unpack() {
- default
- mv -- "${WORKDIR}/${PN}-${EGIT_COMMIT}" "${WORKDIR}/${P}"
-};;
-*)
- RESTRICT="mirror"
- SRC_URI="https://github.com/plougher/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-${EXTRA_URI}";;
-esac
-S="${WORKDIR}/${P}/${PN}"
-
-LIB_DEPEND="sys-libs/zlib:=[static-libs(+)]
- lz4? ( app-arch/lz4:=[static-libs(+)] )
- lzma? ( app-arch/xz-utils:=[static-libs(+)] )
- lzo? ( dev-libs/lzo:=[static-libs(+)] )
- xattr? ( sys-apps/attr:=[static-libs(+)] )
- xz? ( app-arch/xz-utils:=[static-libs(+)] )
- zstd? ( >=app-arch/zstd-1.0:=[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-src_prepare() {
- sed -n -e 's/^#ifndef linux$/#if !defined(linux) && !defined(__GLIBC__)/' \
- -- "${S}"/*.c "${S}"/*.h || die
- default
-}
-
-use10() {
- usex $1 1 0
-}
-
-src_configure() {
- # set up make command line variables in EMAKE_SQUASHFS_CONF
- EMAKE_SQUASHFS_CONF=(
- LZMA_XZ_SUPPORT=$(use10 lzma)
- LZO_SUPPORT=$(use10 lzo)
- LZ4_SUPPORT=$(use10 lz4)
- XATTR_SUPPORT=$(use10 xattr)
- XZ_SUPPORT=$(use10 xz)
- ZSTD_SUPPORT=$(use10 zstd)
- )
- filter-flags -fno-common
-
- tc-export CC
- use debug && append-cppflags -DSQUASHFS_TRACE
- use static && append-ldflags -static
-}
-
-src_compile() {
- emake "${EMAKE_SQUASHFS_CONF[@]}"
-}
-
-src_install() {
- dobin mksquashfs unsquashfs
- cd ..
- dodoc CHANGES README README-4.4 ACKNOWLEDGEMENTS USAGE RELEASE-READMEs/*
- doman "${WORKDIR}"/debian/manpages/*.[0-9]
-}
diff --git a/sys-fs/squashfuse/Manifest b/sys-fs/squashfuse/Manifest
deleted file mode 100644
index 9d196117..00000000
--- a/sys-fs/squashfuse/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST squashfuse-0.1.104.tar.gz 63596 SHA512 34e5092fb422b98ec7eaaa5ea1fe71c401cf9cfb0fdad8d89f8ed1662912b3733fceafb2959af988467363e5d7fc9ccdd37cc2bcfc090379c4f9e38a415f7a2b
diff --git a/sys-fs/squashfuse/metadata.xml b/sys-fs/squashfuse/metadata.xml
deleted file mode 100644
index 9a59f7af..00000000
--- a/sys-fs/squashfuse/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <upstream>
- <bugs-to>mailto:dave@vasilevsky.ca</bugs-to>
- <changelog>https://github.com/vasi/squashfuse/commits/master</changelog>
- <doc>https://raw.github.com/vasi/squashfuse/master/README</doc>
- <remote-id type="github">vasi/squashfuse</remote-id>
- </upstream>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- <description>maintainer of the updates in the mv overlay</description>
- </maintainer>
- <maintainer type="person">
- <email>zmedico@gentoo.org</email>
- <name>Zac Medico</name>
- </maintainer>
- <use>
- <flag name="lz4">Enable support for lz4 compression</flag>
- <flag name="zstd">Enable support for zstd compression</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-fs/squashfuse/squashfuse-0.1.104.ebuild b/sys-fs/squashfuse/squashfuse-0.1.104.ebuild
deleted file mode 100644
index e42cfb89..00000000
--- a/sys-fs/squashfuse/squashfuse-0.1.104.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-inherit autotools flag-o-matic
-
-DESCRIPTION="FUSE filesystem to mount squashfs archives"
-HOMEPAGE="https://github.com/vasi/squashfuse"
-
-case ${PV} in
-*alpha*)
- EGIT_COMMIT="0b48352ed7a89d920bb6792ac59f9f6775088f02"
- SRC_URI="https://github.com/vasi/squashfuse/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S=${WORKDIR}/${PN}-${EGIT_COMMIT}
- alpha=:;;
-*)
- SRC_URI="https://github.com/vasi/squashfuse/archive/${PV}/${P}.tar.gz"
- alpha=false;;
-esac
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="lz4 lzma lzo static-libs +zlib zstd"
-REQUIRED_USE="|| ( lz4 lzma lzo zlib zstd )"
-
-COMMON_DEPEND="
- sys-fs/fuse:3=
- lzma? ( >=app-arch/xz-utils-5.0.4:= )
- zlib? ( >=sys-libs/zlib-1.2.5-r2:= )
- lzo? ( >=dev-libs/lzo-2.06:= )
- lz4? ( >=app-arch/lz4-0_p106:= )
- zstd? ( >=app-arch/zstd-1.0:= )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
- default
- ! $alpha || sed -i -e '1s:\[0\.1\.100\]:['"${PV}"']:' configure.ac || die
- AT_M4DIR=${S}/m4 eautoreconf
-}
-
-src_configure() {
- filter-flags '-flto*' -fwhole-program -fno-common
- local myconf=(
- $(use lz4 || echo --without-lz4)
- $(use lzma || echo --without-xz)
- $(use lzo || echo --without-lzo)
- $(use zlib || echo --without-zlib)
- $(use zstd || echo --without-zstd)
- $(use static-libs || echo --disable-static)
- )
- econf "${myconf[@]}"
-}
diff --git a/sys-fs/squashmount/ChangeLog b/sys-fs/squashmount/ChangeLog
new file mode 100644
index 00000000..962be6f1
--- /dev/null
+++ b/sys-fs/squashmount/ChangeLog
@@ -0,0 +1,376 @@
+# ChangeLog for sys-fs/squashmount
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*squashmount-12.2.0 (20 Sep 2015)
+
+ 07 Aug 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-12.1.1 (07 Aug 2015)
+
+ 07 Aug 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-12.1.0 (18 Jul 2015)
+
+ 18 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-12.0.1 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-12.0.0 (07 Jun 2015)
+
+ 07 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-11.0.1 (24 May 2015)
+
+ 24 May 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support sync-type = squashdelta
+
+*squashmount-10.1.0 (23 May 2015)
+
+ 23 May 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-10.0.2 (06 Apr 2015)
+
+ 06 Apr 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-10.0.1 (17 Mar 2015)
+
+ 17 Mar 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-10.0.0 (15 Mar 2015)
+
+ 15 Mar 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-9.0.1 (25 Dec 2014)
+
+ 27 Dec 2014; Martin Väth <martin@mvath.de>:
+ Add blocker to <openrc-0.13
+
+ 25 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-9.0.0 (11 Dec 2014)
+
+ 11 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support overlay of linux-3.18
+
+*squashmount-8.7.9 (10 Dec 2014)
+
+ 10 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-8.7.8 (28 Nov 2014)
+
+ 28 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-8.7.7 (11 Nov 2014)
+
+ 11 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-8.7.6 (10 Nov 2014)
+
+ 10 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Add $modprobe_loop (workaround for udev bug)
+
+*squashmount-8.7.5 (31 Oct 2014)
+
+ 31 Oct 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix timeout for systemd
+
+*squashmount-8.7.4 (12 Oct 2014)
+
+ 12 Oct 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-8.7.3 (20 Sep 2014)
+
+ 20 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Replace 'EOF' by 1 in configs!
+
+*squashmount-8.7.1 (13 Sep 2014)
+
+ 13 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. More precise perl deps
+
+*squashmount-8.7 (29 Aug 2014)
+
+ 20 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuilds. Remove IUSE=examples.d. Add find_cruft.d
+
+*squashmount-8.6 (23 Aug 2014)
+
+ 23 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-8.5 (21 Aug 2014)
+
+ 21 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-8.4 (20 Aug 2014)
+
+ 20 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Add USE=example
+
+*squashmount-8.3 (19 Aug 2014)
+
+ 19 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-8.2 (18 Aug 2014)
+
+ 18 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-8.1 (17 Aug 2014)
+
+ 17 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-8.0 (16 Aug 2014)
+
+ 16 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Advanced configuration
+
+*squashmount-7.12 (15 Aug 2014)
+
+ 15 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-7.11 (09 Aug 2014)
+
+ 09 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-7.10 (30 Jul 2014)
+
+ 08 Aug 2014; Martin Väth <martin@mvath.de>:
+ Be more strict with optfeature
+
+ 30 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-7.9 (29 Jul 2014)
+
+ 29 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-7.8 (28 Jul 2014)
+
+ 28 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-7.7 (18 Jul 2014)
+
+ 18 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-7.6 (17 Jul 2014)
+
+ 17 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-7.5 (16 Jul 2014)
+
+ 16 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-7.4 (09 Jul 2014)
+
+ 09 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-7.3 (06 Jul 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. New style github tarball
+
+*squashmount-7.1 (05 Jul 2014)
+
+ 05 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-7.0 (04 Jul 2014)
+
+ 04 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump to support current overlayfs.
+ WARNING: standard_mount changed! You likely have to modify your dir layout!
+
+*squashmount-6.3 (09 Jun 2014)
+
+ 09 Jun 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. New $mksquash_verbose/--mksquash-verbose
+ replaces now obsolete $squash_verbose/--mksquash-verbose
+
+*squashmount-6.1 (08 Jun 2014)
+
+ 08 Jun 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-6.0a (21 May 2014)
+
+ 21 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump to revert to COMPRESSION=xz default. Mask old by keyword.
+
+*squashmount-6.0 (17 May 2014)
+
+ 17 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-5.0 (05 May 2014)
+
+ 05 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-4.5 (30 Mar 2014)
+
+ 30 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-4.4 (22 Mar 2014)
+
+ 22 Mar 2014; Martin Väth <martin@mvath.de>:
+ Add sanity check before deleting DIR after first creation of squashfile
+
+*squashmount-4.3 (09 Mar 2014)
+
+ 15 Mar 2014; Martin Väth <martin@mvath.de>:
+ Use optfeature
+
+ 09 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-4.2 (21 Jan 2014)
+
+ 24 Jan 2014; Martin Väth <martin@mvath.de>:
+ Avoid duplicate installation
+
+ 21 Jan 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-4.1 (03 Dec 2013)
+
+ 03 Dec 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support $killpower (/etc/killpower)
+
+*squashmount-4.0-r1 (17 Dec 2013)
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix perl path
+
+*squashmount-4.0 (24 Nov 2013)
+
+ 24 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-3.8 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-3.7-r1 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Shebang care
+
+*squashmount-3.7 (22 Oct 2013)
+
+ 22 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-3.6 (19 Oct 2013)
+
+ 12 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Introduce CHOWN, CHMOD; default CHMOD=>0644
+
+*squashmount-3.5 (09 Oct 2013)
+
+ 12 Oct 2013; Martin Väth <martin@mvath.de>:
+ Use readme.gentoo.eclass
+
+ 09 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-3.4 (03 Oct 2013)
+
+ 03 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-3.3 (22 Sep 2013)
+
+ 22 Sep 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-3.1 (21 Sep 2013)
+
+ 21 Sep 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Report new recommended dependencies.
+ This version will modprobe required modules and can be configured to skip
+ overlayfs or aufs depending on availability without a warning.
+
+*squashmount-2.10 (09 Sep 2013)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 09 Sep 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-2.9 (04 Sep 2013)
+
+ 05 Sep 2013; Martin Väth <martin@mvath.de>:
+ Depend properly on virtual/perl-* to avoid possible issues with perl-5.18
+ or newer versions.
+
+ 04 Sep 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fixes breakage with systemd
+ (regression of squashmount-2.8)
+
+*squashmount-2.8 (31 Aug 2013)
+
+ 31 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-2.6 (24 Aug 2013)
+
+ 24 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-2.5 (22 Aug 2013)
+
+ 22 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fixes severe umount bug.
+
+*squashmount-2.3 (21 Aug 2013)
+
+ 21 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix restart bug. Many improvements.
+ Recommend >=perl-5.14 (or Term-ANSIColor) for colored output
+
+*squashmount-2.2 (20 Aug 2013)
+
+ 20 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Recommend dev-perl/File-Which
+
+*squashmount-2.1 (19 Aug 2013)
+
+ 19 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*squashmount-1.1 (18 Aug 2013)
+
+ 18 Aug 2013; Martin Väth <martin@mvath.de>:
+ This is the successor of sys-fs/squash_dir
diff --git a/sys-fs/squashmount/Manifest b/sys-fs/squashmount/Manifest
index 988bff3a..f946a86a 100644
--- a/sys-fs/squashmount/Manifest
+++ b/sys-fs/squashmount/Manifest
@@ -1 +1 @@
-DIST squashmount-22.1.tar.gz 76068 SHA512 ac2079b6a58615c7232f60e1f1dc498dee16ef30a83a3057c7768f75b810aeca01b567b506977919eb68abe44b28b7b8c126ac82941a6a38c676cb4ba2c950e1
+DIST squashmount-12.2.0.tar.gz 60947 SHA256 1c0bd682cecd1dafb44e2191e9c5844e9a731f91a8d65eca014a563feecbff01 SHA512 50b6356f7de8992198b950df1d86333e80fed6493bd683eca51be3beff577406f9914182ff3b5adc8956ed1337a5e2518a171e80075f60e7c1b7d1c05f4c19fc WHIRLPOOL 9afa5f3d02b71c84e7e8d7b56911a2c052f7059289ed0b344087917dac21ba07a0b65860e99fc3f682b6cec2ef1c36e4df3e1395c3b72c803df9d54007d0e348
diff --git a/sys-fs/squashmount/metadata.xml b/sys-fs/squashmount/metadata.xml
index de454a00..5c80606b 100644
--- a/sys-fs/squashmount/metadata.xml
+++ b/sys-fs/squashmount/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/sys-fs/squashmount/squashmount-22.1.ebuild b/sys-fs/squashmount/squashmount-12.2.0.ebuild
index 082c0e4d..21864cd5 100644
--- a/sys-fs/squashmount/squashmount-22.1.ebuild
+++ b/sys-fs/squashmount/squashmount-12.2.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2013-2021 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# $Id$
-EAPI=7
+EAPI=5
RESTRICT="mirror"
-inherit optfeature readme.gentoo-r1 systemd tmpfiles
+inherit eutils readme.gentoo systemd
DESCRIPTION="Keep directories compressed with squashfs. Useful for portage tree, texmf-dist"
HOMEPAGE="http://forums.gentoo.org/viewtopic-t-465367.html
@@ -12,23 +13,15 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
-# These should really depend on USE-flags but must not by policy.
-# Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283
-OPTIONAL_RDEPEND="app-shells/runtitle
-dev-perl/File-Which
-!arm? ( !ia64? ( !sparc? ( dev-perl/String-ShellQuote ) ) )"
-
RDEPEND="!<sys-apps/openrc-0.13
- >=dev-lang/perl-5.22
+ >=app-shells/runtitle-2.3
+ >=dev-lang/perl-5.12
|| ( dev-perl/File-Which sys-apps/which )
- || ( sys-fs/squashfs-tools sys-fs/squashfs-tools-ng )
- !<sys-fs/unionfs-fuse-0.25
- !<app-portage/find_cruft-4.0.0
- ${OPTIONAL_RDEPEND}"
-# >=dev-lang/perl-5.12
+ sys-fs/squashfs-tools
+ !<sys-fs/unionfs-fuse-0.25"
# || ( >=dev-lang/perl-5.10.1 >=virtual/perl-File-Path-2.6.5 )
# || ( >=dev-lang/perl-5.4.5 virtual/perl-File-Spec )
# || ( >=dev-lang/perl-5.10.1 >=virtual/perl-File-Temp-0.19 )
@@ -42,7 +35,7 @@ DOC_CONTENTS="Please adapt /etc/squashmount.pl as well as
Configure the mount point 'gentoo' only if you use sync-type = squashdelta.
-For improved output use sys-fs/squashfs-tools from the mv overlay.
+For improved output use squasfs-tools from the mv overlay.
It is recommended to put into your zshrc the line:
alias squashmount='noglob squashmount'"
@@ -51,39 +44,30 @@ src_prepare() {
use prefix || sed -i \
-e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
-- bin/* || die
- default
+ epatch_user
}
src_install() {
dobin bin/*
- dodoc README.md ChangeLog compress.txt demo.svg
- docompress -x "/usr/share/doc/${PF}/demo.svg"
+ dodoc README ChangeLog compress.txt etc/squashmount.pl
doinitd openrc/init.d/*
systemd_dounit systemd/system/*
- dotmpfiles tmpfiles.d/*
insinto /etc
- doins -r etc/revdep-rebuild etc/systemd
- exeinto /etc/portage/repo.postsync.d
- doexe etc/portage/repo.postsync.d/*
- insinto /usr/lib
- doins lib/*
- doins -r lib/find_cruft
+ doins -r etc/*
+ insinto /usr/lib/tmpfiles.d
+ doins tmpfiles.d/*
insinto /usr/share/zsh/site-functions
doins zsh/*
readme.gentoo_create_doc
}
pkg_postinst() {
- if use arm || use ia64 || use sparc
- then optfeature "improved output" 'dev-perl/String-ShellQuote'
- fi
- optfeature "user mounting" \
- '>=sys-fs/squashfuse-0.1.100 >=sys-fs/unionfs-fuse-0.25' \
- '>=sys-fs/squashfuse-0.1.100 sys-fs/funionfs'
+ optfeature "status bar support" 'app-shells/runtitle'
+ optfeature "improved compatibility and security" 'dev-perl/File-Which'
+ optfeature "colored output" '>=dev-lang/perl-5.14' 'virtual/perl-Term-ANSIColor'
case " ${REPLACING_VERSIONS}" in
- *' '[0-9].*|*' '1[0-4].*|*' '15.[0-2].*|*' '15.3.0*)
+ ' '[0-7].*|' '8.[0-6]*|' '8.7.[0-4]*)
FORCE_PRINT_ELOG="true";;
esac
- readme.gentoo_print_elog
- tmpfiles_process squashmount.conf
+ readme.gentoo_pkg_postinst
}
diff --git a/sys-kernel/kccmp/Manifest b/sys-kernel/kccmp/Manifest
deleted file mode 100644
index 8013aeb2..00000000
--- a/sys-kernel/kccmp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kccmp-0.3.tar.gz 14033 SHA512 0274f36bf0e9d702b3e8efc0168987fd4c54ffc316a967ff326ad4c969996143a93bbaccee6dea0afd254bdf875c05492c35b11fd7121e0b9127467286e8e013
diff --git a/sys-kernel/kccmp/kccmp-0.3-r2.ebuild b/sys-kernel/kccmp/kccmp-0.3-r2.ebuild
deleted file mode 100644
index 9876c40b..00000000
--- a/sys-kernel/kccmp/kccmp-0.3-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qmake-utils
-
-DESCRIPTION="A simple tool for comparing two linux kernel .config files"
-HOMEPAGE="http://stoopidsimple.com/kccmp/"
-SRC_URI="http://stoopidsimple.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- echo "QT += widgets" >> ${PN}.pro
- default
-}
-
-src_configure() {
- eqmake5 "${S}"/kccmp.pro
-}
-
-src_install() {
- dobin kccmp
- dodoc README
-}
diff --git a/sys-kernel/kccmp/metadata.xml b/sys-kernel/kccmp/metadata.xml
deleted file mode 100644
index 7f4e652d..00000000
--- a/sys-kernel/kccmp/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- <description>maintainer of the updates in the mv overlay</description>
-</maintainer>
-<maintainer type="person">
- <email>mpagano@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
- <email>kernel@gentoo.org</email>
- <name>Gentoo Kernel Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-kernel/kconfig-hardened-check/Manifest b/sys-kernel/kconfig-hardened-check/Manifest
deleted file mode 100644
index 55bc0255..00000000
--- a/sys-kernel/kconfig-hardened-check/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kconfig-hardened-check-0.5.9.tar.gz 1574662 SHA512 447f9f11ebd995938ea367dc410a8d263a47444d9b479c1855e88c4d0f534e76e7b2996bd773fc280ff928f4b11e5741351bb4df781a81f4023fd57441ade5f2
diff --git a/sys-kernel/kconfig-hardened-check/kconfig-hardened-check-0.5.9.ebuild b/sys-kernel/kconfig-hardened-check/kconfig-hardened-check-0.5.9.ebuild
deleted file mode 100644
index aae1e037..00000000
--- a/sys-kernel/kconfig-hardened-check/kconfig-hardened-check-0.5.9.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
- # Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A script for checking the hardening options in the Linux kernel config"
-HOMEPAGE="https://github.com/a13xp0p0v/kconfig-hardened-check"
-
-case ${PV} in
-99999999)
- inherit git-r3
- EGIT_REPO_URI="https://github.com/a13xp0p0v/kconfig-hardened-check"
-;;
-*)
- SRC_URI="https://github.com/a13xp0p0v/kconfig-hardened-check/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- RESTRICT="mirror"
-;;
-esac
-
-IUSE=""
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="${PYTHON_DEPS}"
-BDEPEND="${RDEPEND}"
-
-src_install() {
- distutils-r1_src_install
- dodoc -r "${PN//-/_}"/config_files/ README.md
-}
diff --git a/sys-kernel/kconfig-hardened-check/kconfig-hardened-check-99999999.ebuild b/sys-kernel/kconfig-hardened-check/kconfig-hardened-check-99999999.ebuild
deleted file mode 100644
index 029b37f1..00000000
--- a/sys-kernel/kconfig-hardened-check/kconfig-hardened-check-99999999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A script for checking the hardening options in the Linux kernel config"
-HOMEPAGE="https://github.com/a13xp0p0v/kconfig-hardened-check"
-
-case ${PV} in
-99999999)
- inherit git-r3
- EGIT_REPO_URI="https://github.com/a13xp0p0v/kconfig-hardened-check"
-;;
-*)
- SRC_URI="https://github.com/a13xp0p0v/kconfig-hardened-check/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- RESTRICT="mirror"
-;;
-esac
-
-IUSE=""
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="${PYTHON_DEPS}"
-BDEPEND="${RDEPEND}"
-
-src_install() {
- distutils-r1_src_install
- dodoc -r "${PN//-/_}"/config_files/ README.md
-}
diff --git a/sys-kernel/kernel/ChangeLog b/sys-kernel/kernel/ChangeLog
new file mode 100644
index 00000000..d5c528b1
--- /dev/null
+++ b/sys-kernel/kernel/ChangeLog
@@ -0,0 +1,181 @@
+# ChangeLog for sys-kernel/kernel
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*kernel-1.39 (02 Sep 2015)
+
+ 02 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.38 (14 Jul 2015)
+
+ 14 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.36 (12 Jul 2015)
+
+ 12 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.35 (16 Jun 2015)
+
+ 16 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.34 (22 Jan 2015)
+
+ 22 Jan 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Make bash compatible
+
+*kernel-1.33 (20 Nov 2014)
+
+ 20 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Support ccache-3.2
+
+*kernel-1.32 (30 Mar 2014)
+
+ 06 Jul 2014; Martin Väth <martin@mvath.de>:
+ New style github tarball
+
+ 30 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.31 (28 Dec 2013)
+
+ 15 Mar 2014; Martin Väth <martin@mvath.de>:
+ Use optfeature
+
+ 28 Dec 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Improve CCACHE_* support
+
+*kernel-1.30-r1 (17 Dec 2013)
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ Fix sh path
+
+*kernel-1.30 (10 Dec 2013)
+
+ 10 Dec 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.29 (21 Nov 2013)
+
+ 21 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.28 (02 Nov 2013)
+
+ 02 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Shebang care
+
+*kernel-1.27 (03 Oct 2013)
+
+ 03 Oct 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.26 (17 Nov 2012)
+
+ 10 Sep 2013; Martin Väth <martin@mvath.de>:
+ Install zsh-completion unconditionally according to gentoo policy
+
+ 01 Dev 2012; Martin Väth <martin@mvath.de>:
+ Remove USE=eix; only log recommendation if appropriate
+
+ 17 Nov 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Improve zsh-completion
+
+ 10 Jun 2013; Martin Väth <martin@mvath.de>:
+ Make runtitle mandatory for USE=zsh-completion, recommend otherwise
+
+*kernel-1.25 (21 Oct 2012)
+
+ 21 Oct 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Add zsh-completion
+
+*kernel-1.24 (14 Oct 2012)
+
+ 14 Oct 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Fix sudox call
+
+*kernel-1.23 (14 Sep 2012)
+
+ 28 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5
+
+ 14 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.22 (06 Sep 2012)
+
+ 06 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.21 (19 Jun 2012)
+
+ 19 Jun 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.20 (20 May 2012)
+
+ 20 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.19 (15 May 2012)
+
+ 15 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.17 (06 May 2012)
+
+ 12 May 2012; Martin Väth <martin@mvath.de>:
+ base->eutils
+
+ 06 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Makes app-shells/push mandatory
+
+*kernel-1.16 (04 May 2012)
+
+ 04 May 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.15 (08 Apr 2012)
+
+ 15 Apr 2012; Martin Väth <martin@mvath.de>:
+ Inherit base
+
+ 08 Apr 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.14 (29 Feb 2012)
+
+ 19 Mar 2012; Martin Väth <martin@mvath.de>:
+ Use vcs-snapshot.eclass
+
+ 29 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.13 (28 Feb 2012)
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.12 (17 Feb 2012)
+
+ 17 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Improve status line support; change option
+
+*kernel-1.11 (29 Jan 2012)
+
+ 29 Jan 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*kernel-1.10 (21 Dec 2011)
+
+ 09 Jan 2012; Martin Väth <martin@mvath.de>:
+ Reformat deps
+
+ 26 Dec 2011; Martin Väth <martin@mvath.de>:
+ Fix dependencies
+
+ 21 Dec 2011; Martin Väth <martin@mvath.de>:
+ New ebuild from scratch
diff --git a/sys-kernel/kernel/Manifest b/sys-kernel/kernel/Manifest
index 3f201742..017687a4 100644
--- a/sys-kernel/kernel/Manifest
+++ b/sys-kernel/kernel/Manifest
@@ -1 +1 @@
-DIST kernel-6.3.tar.gz 10741 SHA512 ea78baf9126452f6affbdeffe8f1c21bc1f253e11fcb4bc97faf2ae015d0b467fed00d32a37ff1c523da92d7bec1ad7a437d7f61878230ef4c5d7101fe7e0fe0
+DIST kernel-1.39.tar.gz 7210 SHA256 e8e97235120ce0b2b9b75f7217a2e4d976e00dde342d46b1edaf82749c47b93f SHA512 27c89c8a751a0523232bcaba71459e4b045f690da69164d6f64acdccb483bc5d36da0f17288dbf7c09e59bb0d67311ad22af6455b15007a042b7712e2bccc7ee WHIRLPOOL 83f1740fef7166e82322c2a4f972e03f64a2ae347d26fa6839c5abb744ecb246a4bb84cab5fe5fdcd78ecf98edaf1f61ce06309c95d82fc59151f3d3d3c5e13b
diff --git a/sys-kernel/kernel/kernel-1.39.ebuild b/sys-kernel/kernel/kernel-1.39.ebuild
new file mode 100644
index 00000000..528ac75e
--- /dev/null
+++ b/sys-kernel/kernel/kernel-1.39.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils
+
+DESCRIPTION="A POSIX shell script to compile the kernel with user permissions"
+HOMEPAGE="https://github.com/vaeth/kernel/"
+SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="app-admin/sudo
+ app-admin/sudox
+ app-shells/push
+ >=app-shells/runtitle-2.3
+ !<dev-util/ccache-3.2"
+DEPEND=""
+
+src_prepare() {
+ use prefix || sed -i \
+ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+ -- "${PN}" || die
+ epatch_user
+}
+
+src_install() {
+ dobin "${PN}"
+ insinto /usr/share/zsh/site-functions
+ doins _*
+}
+
+pkg_postinst() {
+ optfeature "faster execution" 'app-portage/eix'
+ optfeature "status bar support" 'app-shells/runtitle'
+}
diff --git a/sys-kernel/kernel/kernel-6.3.ebuild b/sys-kernel/kernel/kernel-6.3.ebuild
deleted file mode 100644
index 4879fa8d..00000000
--- a/sys-kernel/kernel/kernel-6.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2011-2021 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-inherit optfeature
-
-DESCRIPTION="A POSIX shell script to compile the kernel with user permissions"
-HOMEPAGE="https://github.com/vaeth/kernel/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# This should really depend on a USE-flag but must not by policy.
-# Waiting for https://bugs.gentoo.org/show_bug.cgi?id=424283
-OPTIONAL_RDEPEND=">=app-shells/runtitle-2.3"
-
-RDEPEND="app-admin/sudo
- app-admin/sudox
- >=app-shells/push-2.0-r2
- !<dev-util/ccache-3.2
- ${OPTIONAL_RDEPEND}"
-DEPEND=""
-
-src_prepare() {
- use prefix || sed -i \
- -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
- -- bin/* || die
- default
-}
-
-src_install() {
- dobin bin/*
- insinto /usr/share/zsh/site-functions
- doins zsh/*
-}
-
-pkg_postinst() {
- optfeature "faster execution" '>=app-portage/eix-0.32.2'
-}
diff --git a/sys-kernel/kernel/metadata.xml b/sys-kernel/kernel/metadata.xml
index b66807ef..1443c144 100644
--- a/sys-kernel/kernel/metadata.xml
+++ b/sys-kernel/kernel/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/sys-power/cpupower/cpupower-99999999.ebuild b/sys-power/cpupower/cpupower-99999999.ebuild
deleted file mode 100644
index 539012a8..00000000
--- a/sys-power/cpupower/cpupower-99999999.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2013-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs linux-info
-
-DESCRIPTION="Shows and sets processor power related values"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0/0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="nls"
-
-# File collision w/ headers of the deprecated cpufrequtils
-RDEPEND="sys-apps/pciutils"
-DEPEND="${RDEPEND}
- virtual/os-headers
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}/cpupower-5.4-cflags.patch"
-)
-
-pkg_setup() {
- linux-info_pkg_setup
- KV_SRC=${KV_MAJOR}.${KV_MINOR}
- LINUX_SRC=linux-${KV_SRC}
- S="${WORKDIR}/${LINUX_SRC}"
-}
-
-src_unpack() {
- unpack "${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/${LINUX_SRC}.tar.xz"
-}
-
-src_configure() {
- export bindir="${EPREFIX}/usr/bin"
- export sbindir="${EPREFIX}/usr/sbin"
- export mandir="${EPREFIX}/usr/share/man"
- export includedir="${EPREFIX}/usr/include"
- export libdir="${EPREFIX}/usr/$(get_libdir)"
- export localedir="${EPREFIX}/usr/share/locale"
- export docdir="${EPREFIX}/usr/share/doc/${PF}"
- export confdir="${EPREFIX}/etc"
- export bash_completion_dir="${EPREFIX}/usr/share/bash-completion/completions"
- export V=1
- export NLS=$(usex nls true false)
-}
-
-src_compile() {
- myemakeargs=(
- AR="$(tc-getAR)"
- CC="$(tc-getCC)"
- LD="$(tc-getCC)"
- VERSION=${KV_FULL}
- )
-
- cd tools/power/cpupower || die
- emake "${myemakeargs[@]}"
-}
-
-src_install() {
- cd tools/power/cpupower || die
- emake "${myemakeargs[@]}" DESTDIR="${D}" install
- doheader lib/cpupower.h
- einstalldocs
-
- newconfd "${FILESDIR}"/conf.d-r2 cpupower
- newinitd "${FILESDIR}"/init.d-r4 cpupower
-
- systemd_dounit "${FILESDIR}"/cpupower-frequency-set.service
- systemd_install_serviced "${FILESDIR}"/cpupower-frequency-set.service.conf
-}
diff --git a/sys-power/cpupower/files/conf.d-r2 b/sys-power/cpupower/files/conf.d-r2
deleted file mode 100644
index 1e67ed04..00000000
--- a/sys-power/cpupower/files/conf.d-r2
+++ /dev/null
@@ -1,36 +0,0 @@
-# /etc/conf.d/cpupower: config file for /etc/init.d/cpupower
-
-# Options when starting cpufreq (given to the `cpupower` program)
-# Possible options are:
-# -g --governor <GOV> (ie: ondemand, performance, or powersave)
-# -d --min <FREQ> (ie: 1000MHz)
-# -u --max <FREQ> (ie: 2000MHz)
-# -f --freq <FREQ> (requires userspace governor, this *can not* be combined with
-# with any other parameters).
-# Frequencies can be passed in Hz, kHz (default), MHz, GHz, or THz by postfixing the
-# value with the wanted unit name, without any space.
-# (frequency in kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).
-
-START_OPTS="--governor ondemand"
-
-# Options when stopping cpufreq (given to the `cpupower` program)
-# This option can be used to change governer on stop. Leaving it empty will ensure
-# the governer remains on the one provided above.
-STOP_OPTS=""
-
-# Extra settings to write to sysfs cpufreq values.
-#
-# up_threshold: threshold for stepping up frequency, where the value represents
-# the percentage of cpu load.
-#
-# down_threshold: threshold for stepping down frequency, where the value
-# represents the percentage of cpu load.
-#
-# sampling_down_factor: determines how frequently the governor polls the cpu, a
-# value greater than 1 improves performance by reducing the polling when the
-# load is high. This tunable has no effect on behavior at lower CPU frequencies.
-#
-# ignore_nice_load: when set to '1' the processes that are run with a 'nice'
-# value will not count in the usage calculation.
-
-#SYSFS_EXTRA="ondemand/ignore_nice_load=1 ondemand/up_threshold=75 ondemand/sampling_down_factor=10"
diff --git a/sys-power/cpupower/files/cpupower-5.4-cflags.patch b/sys-power/cpupower/files/cpupower-5.4-cflags.patch
deleted file mode 100644
index f21435a0..00000000
--- a/sys-power/cpupower/files/cpupower-5.4-cflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6ae1f1b03aaaee6a9a56040d3ba7af6bf6648ad6 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 27 Nov 2019 10:51:15 -0500
-Subject: [PATCH] Respect user CFLAGS
-
----
- tools/power/cpupower/Makefile | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile
-index c8622497ef23..f17e8c94da16 100644
---- a/tools/power/cpupower/Makefile
-+++ b/tools/power/cpupower/Makefile
-@@ -178,14 +178,7 @@ else
- endif
- export QUIET ECHO
-
--# if DEBUG is enabled, then we do not strip or optimize
--ifeq ($(strip $(DEBUG)),true)
-- override CFLAGS += -O1 -g -DDEBUG
-- STRIPCMD = /bin/true -Since_we_are_debugging
--else
-- override CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer
-- STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
--endif
-+STRIPCMD = true
-
-
- # the actual make rules
---
-2.24.0
-
diff --git a/sys-power/cpupower/files/cpupower-frequency-set.service b/sys-power/cpupower/files/cpupower-frequency-set.service
deleted file mode 100644
index 8f2f4d9b..00000000
--- a/sys-power/cpupower/files/cpupower-frequency-set.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=CPU Frequency Scaling
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/cpupower frequency-set $OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-power/cpupower/files/cpupower-frequency-set.service.conf b/sys-power/cpupower/files/cpupower-frequency-set.service.conf
deleted file mode 100644
index 969c8ab2..00000000
--- a/sys-power/cpupower/files/cpupower-frequency-set.service.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-Environment="OPTS=-g ondemand"
diff --git a/sys-power/cpupower/files/init.d-r4 b/sys-power/cpupower/files/init.d-r4
deleted file mode 100644
index febed865..00000000
--- a/sys-power/cpupower/files/init.d-r4
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CPUFREQ_SYSFS=/sys/devices/system/cpu/cpufreq
-
-change() {
- local c ret=0 opts="$1"
- if [ -n "$opts" ] ; then
- ebegin "Running cpupower -c all frequency-set ${opts}"
- cpupower -c all frequency-set ${opts} >/dev/null 2>&1
- : $(( ret += $? ))
- eend ${ret}
-
- if [ -d ${CPUFREQ_SYSFS} ] && [ -n "${SYSFS_EXTRA}" ] ; then
- c=1
- einfo "Setting extra options: ${SYSFS_EXTRA}"
- if cd ${CPUFREQ_SYSFS} ; then
- local o v
- for o in ${SYSFS_EXTRA} ; do
- v=${o#*=}
- o=${o%%=*}
- echo ${v} > ${o} || break
- done
- c=0
- fi
- eend ${c}
- : $(( ret += c ))
- fi
- fi
-
- return ${ret}
-}
-
-start() {
- change "${START_OPTS}"
-}
-
-stop() {
- change "${STOP_OPTS}"
-}
diff --git a/sys-power/cpupower/metadata.xml b/sys-power/cpupower/metadata.xml
deleted file mode 100644
index 5bcecc2e..00000000
--- a/sys-power/cpupower/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>floppym@gentoo.org</email>
- <name>Mike Gilbert</name>
- </maintainer>
- <slots>
- <subslots>Subslots correspond to major version of libcpupower</subslots>
- </slots>
-</pkgmetadata>
diff --git a/virtual/cdrtools/cdrtools-1.ebuild b/virtual/cdrtools/cdrtools-1.ebuild
deleted file mode 100644
index 310bc627..00000000
--- a/virtual/cdrtools/cdrtools-1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for command-line recorders cdrtools and cdrkit"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-HOMEPAGE=
-SRC_URI=
-LICENSE=
-IUSE=
-
-RDEPEND="|| ( app-shells/schily-tools[schilytools_cdrtools] app-cdr/cdrtools )"
diff --git a/virtual/cdrtools/metadata.xml b/virtual/cdrtools/metadata.xml
deleted file mode 100644
index b919c846..00000000
--- a/virtual/cdrtools/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
-</pkgmetadata>
diff --git a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r4.ebuild b/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r4.ebuild
deleted file mode 100644
index 533cde75..00000000
--- a/virtual/freedesktop-icon-theme/freedesktop-icon-theme-0-r4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to choose between different icon themes"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-SRC_URI=""
-LICENSE=""
-HOMEPAGE=""
-IUSE=""
-
-# Compared to the gentoo repository, we add:
-# hicolor-icon-theme (which is needed for gimp anyway)
-
-RDEPEND="|| (
- x11-themes/hicolor-icon-theme
- lxde-base/lxde-icon-theme
- x11-themes/tango-icon-theme
- kde-frameworks/breeze-icons
- kde-frameworks/oxygen-icons
- x11-themes/mate-icon-theme
- x11-themes/elementary-xfce-icon-theme
- x11-themes/adwaita-icon-theme
- x11-themes/faenza-icon-theme
-)"
diff --git a/virtual/freedesktop-icon-theme/metadata.xml b/virtual/freedesktop-icon-theme/metadata.xml
deleted file mode 100644
index 250e9225..00000000
--- a/virtual/freedesktop-icon-theme/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>freedesktop-bugs@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/virtual/man/man-0-r4.ebuild b/virtual/man/man-0-r4.ebuild
deleted file mode 100644
index 8d0cd1d8..00000000
--- a/virtual/man/man-0-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for man"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-HOMEPAGE=
-SRC_URI=
-LICENSE=
-IUSE=
-
-RDEPEND="
- || (
- >=app-text/mandoc-1.14.5-r1[system-man]
- sys-apps/man
- sys-apps/man-db
- )
-"
diff --git a/virtual/man/metadata.xml b/virtual/man/metadata.xml
deleted file mode 100644
index 56c12441..00000000
--- a/virtual/man/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/www-plugins/bookmark-dupes/Manifest b/www-plugins/bookmark-dupes/Manifest
deleted file mode 100644
index 476261fe..00000000
--- a/www-plugins/bookmark-dupes/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bookmark_dupes-6.4-fx.xpi 65777 SHA512 5b5b5b851f2ae839bb6502eddd163eabc6f1d0f5037ff9eb875bf9e3a08e43a0697dce6ddf6e291533eb03b177e8d6018991ebf30cffdde2b76a749cdf1ce576
diff --git a/www-plugins/bookmark-dupes/bookmark-dupes-6.4.ebuild b/www-plugins/bookmark-dupes/bookmark-dupes-6.4.ebuild
deleted file mode 100644
index 15865730..00000000
--- a/www-plugins/bookmark-dupes/bookmark-dupes-6.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2017-2020 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox webextension: remove duplicate bookmarks/empty folders/descriptions"
-HOMEPAGE="https://addons.mozilla.org/en-US/firefox/addon/bookmark-dupes/
-https://github.com/vaeth/bookmarkdupes/"
-SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/870263/${PN//-/_}-${PV}-fx.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-moz_defaults firefox seamonkey
diff --git a/www-plugins/bookmark-dupes/metadata.xml b/www-plugins/bookmark-dupes/metadata.xml
deleted file mode 100644
index b919c846..00000000
--- a/www-plugins/bookmark-dupes/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
-</pkgmetadata>
diff --git a/www-plugins/calc-extension/Manifest b/www-plugins/calc-extension/Manifest
deleted file mode 100644
index db9a65e6..00000000
--- a/www-plugins/calc-extension/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST calc_extension-5.3-an+fx.xpi 47504 SHA512 aa96ce98ffbeff2edd5d9d095f1833e472f67567eb5bda6b2246a2baa31a64efe804cd31d60b66924d747066e3026426a994311072b6b45e9b7198111a404f99
diff --git a/www-plugins/calc-extension/calc-extension-5.3.ebuild b/www-plugins/calc-extension/calc-extension-5.3.ebuild
deleted file mode 100644
index 06e21cf3..00000000
--- a/www-plugins/calc-extension/calc-extension-5.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox webextension: calculate values of mathematical expressions"
-HOMEPAGE="https://addons.mozilla.org/en-US/firefox/addon/calc-extension/
-https://github.com/vaeth/calc-extension/"
-SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/937719/${PN//-/_}-${PV}-an+fx.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-moz_defaults firefox seamonkey
diff --git a/www-plugins/calc-extension/metadata.xml b/www-plugins/calc-extension/metadata.xml
deleted file mode 100644
index b919c846..00000000
--- a/www-plugins/calc-extension/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
-</pkgmetadata>
diff --git a/www-plugins/canvasblocker/Manifest b/www-plugins/canvasblocker/Manifest
deleted file mode 100644
index 3f2e2524..00000000
--- a/www-plugins/canvasblocker/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST canvasblocker-0.5.5-an+fx.xpi 219911 SHA512 07c0509d0c070ed049c5593dd5f38cebc6df013cb121c1f3e5dc5f3c165ae6a342ec443f9be2d221ce877bd05b85b8bce6f8eeeeb6290ce913e245d85097c421
diff --git a/www-plugins/canvasblocker/canvasblocker-0.5.5.ebuild b/www-plugins/canvasblocker/canvasblocker-0.5.5.ebuild
deleted file mode 100644
index 102ee911..00000000
--- a/www-plugins/canvasblocker/canvasblocker-0.5.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2017-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox webextension: block canvas API to prevent canvas fingerprinting"
-HOMEPAGE="https://addons.mozilla.org/en-US/firefox/addon/canvasblocker/
-https://github.com/kkapsner/CanvasBlocker"
-SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/534930/${PN//-/_}-${PV}-an+fx.xpi"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-moz_defaults firefox seamonkey
diff --git a/www-plugins/canvasblocker/metadata.xml b/www-plugins/canvasblocker/metadata.xml
deleted file mode 100644
index b919c846..00000000
--- a/www-plugins/canvasblocker/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
-</pkgmetadata>
diff --git a/www-plugins/classic-theme-restorer/ChangeLog b/www-plugins/classic-theme-restorer/ChangeLog
new file mode 100644
index 00000000..144c732c
--- /dev/null
+++ b/www-plugins/classic-theme-restorer/ChangeLog
@@ -0,0 +1,93 @@
+# ChangeLog for www-plugins/classic-theme-restorer
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*classic-theme-restorer-1.4.0 (27 Sep 2015)
+
+ 27 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.3.9 (20 Sep 2015)
+
+ 20 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.3.8 (05 Sep 2015)
+
+ 05 Sep 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.3.5 (17 Jul 2015)
+
+ 17 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+cclassic-theme-restorer-1.3.3 (11 Jun 2015)
+
+ 11 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.3.2 (15 May 2015)
+
+ 15 May 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.3.1.1 (30 Apr 2015)
+
+ 30 Apr 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.3.0 (01 Apr 2015)
+
+ 01 Apr 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.2.9.6 (21 Feb 2015)
+
+ 21 Feb 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.2.9.4 (13 Feb 2015)
+
+ 13 Feb 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.2.9.2 (01 Feb 2015)
+
+ 01 Feb 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.2.9.1 (26 Jan 2015)
+
+ 26 Jan 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.2.9 (25 Jan 2015)
+
+ 25 Jan 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.2.8.2 (02 Jan 2015)
+
+ 02 Jan 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.2.6.1 (28 Nov 2014)
+
+ 28 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.2.5 (02 Nov 2014)
+
+ 02 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.2.3 (22 Aug 2014)
+
+ 22 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*classic-theme-restorer-1.1.8 (01 Mar 2014)
+
+ 01 Mar 2014; Martin Väth <martin@mvath.de>:
+ New ebuild
diff --git a/www-plugins/classic-theme-restorer/Manifest b/www-plugins/classic-theme-restorer/Manifest
new file mode 100644
index 00000000..47842ca5
--- /dev/null
+++ b/www-plugins/classic-theme-restorer/Manifest
@@ -0,0 +1 @@
+DIST classic_theme_restorer-1.4.0-fx.xpi 621728 SHA256 8c0c84ebe0352c8094003a4c341d1457a41918590e17620cb17cfaa841372870 SHA512 8a3758572f8ed612260856f018e8a34a96a51bfc3a2007c8c3d8e6a2c988f6880782354dcc8d2163295d690d938922143af3e8eba0fd1b400d9f9e5148033d02 WHIRLPOOL e0e93a4aeb1e67a214d9293eac148ce79aca7471233a7a947de15215c64a7811eb600dc2dd981cf8165d73aa78a88af42fe12888b7d07906ebe74ffbc3f99cc8
diff --git a/www-plugins/classic-theme-restorer/classic-theme-restorer-1.4.0.ebuild b/www-plugins/classic-theme-restorer/classic-theme-restorer-1.4.0.ebuild
new file mode 100644
index 00000000..5d803dec
--- /dev/null
+++ b/www-plugins/classic-theme-restorer/classic-theme-restorer-1.4.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MV_MOZ_MOZILLAS="firefox"
+inherit mv_mozextension
+RESTRICT="mirror"
+
+mPN="${PN//-/_}-${PV}"
+DESCRIPTION="Firefox plugin: restore partially the functionality of non-broken firefox versions"
+HOMEPAGE="https://addons.mozilla.org/de/firefox/addon/classicthemerestorer/"
+SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/472577/${mPN}-fx.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/games-engines/freesci/metadata.xml b/www-plugins/classic-theme-restorer/metadata.xml
index b919c846..73a6d343 100644
--- a/games-engines/freesci/metadata.xml
+++ b/www-plugins/classic-theme-restorer/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/www-plugins/dark-mode/Manifest b/www-plugins/dark-mode/Manifest
deleted file mode 100644
index 8aced8b7..00000000
--- a/www-plugins/dark-mode/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dark_mode_webextension-0.3.7-an+fx.xpi 280649 SHA512 d61bd82e886e1a10cbc3db0f68a8e299835923fe34d8f2a6a7a007987418e1471d89c9679081c386bb0b71f33ab81a06398a38d54bf560befb6b1b80a75d74af
diff --git a/www-plugins/dark-mode/dark-mode-0.3.7.ebuild b/www-plugins/dark-mode/dark-mode-0.3.7.ebuild
deleted file mode 100644
index 81fb2470..00000000
--- a/www-plugins/dark-mode/dark-mode-0.3.7.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2017-2019 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox webextension: a global dark theme for the web"
-HOMEPAGE="https://addons.mozilla.org/en-US/firefox/addon/dark-mode-webextension/"
-SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/786990/${PN//-/_}_webextension-${PV}-an+fx.xpi"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-moz_defaults -i'{174b2d58-b983-4501-ab4b-07e71203cb43}' firefox seamonkey
diff --git a/www-plugins/dark-mode/metadata.xml b/www-plugins/dark-mode/metadata.xml
deleted file mode 100644
index b919c846..00000000
--- a/www-plugins/dark-mode/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
-</pkgmetadata>
diff --git a/www-plugins/decentraleyes/Manifest b/www-plugins/decentraleyes/Manifest
deleted file mode 100644
index 569f261c..00000000
--- a/www-plugins/decentraleyes/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST decentraleyes-2.0.8-an+fx.xpi 5936580 SHA512 5cccb66095e7e74d0d7b05dd555c6cf9bd6e325c77bc8f46af029cc041d36c9864aef429c965b52692cad5ef4264a10cfd448d9b81313bc0b6cddcfcbaf60eba
diff --git a/www-plugins/decentraleyes/decentraleyes-2.0.8.ebuild b/www-plugins/decentraleyes/decentraleyes-2.0.8.ebuild
deleted file mode 100644
index f89d8b91..00000000
--- a/www-plugins/decentraleyes/decentraleyes-2.0.8.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2017-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox webextension: avoid centralized services"
-HOMEPAGE="https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/
-https://github.com/Synzvato/decentraleyes"
-SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/521554/${PN//-/_}-${PV}-an+fx.xpi"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-moz_defaults firefox seamonkey
diff --git a/www-plugins/decentraleyes/metadata.xml b/www-plugins/decentraleyes/metadata.xml
deleted file mode 100644
index b919c846..00000000
--- a/www-plugins/decentraleyes/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
-</pkgmetadata>
diff --git a/www-plugins/duckduckgo/ChangeLog b/www-plugins/duckduckgo/ChangeLog
new file mode 100644
index 00000000..4de32732
--- /dev/null
+++ b/www-plugins/duckduckgo/ChangeLog
@@ -0,0 +1,106 @@
+# ChangeLog for www-plugins/duckduckgo
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*duckduckgo-0.4.6 (02 Nov 2014)
+
+ 17 Jul 2015; Martin Väth <martin@mvath.de>:
+ Use signed tarball
+
+ 02 Nov 2014; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.4.2 (25 Jul 2014)
+
+ 25 Jul 2014; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.4.1 (08 Jul 2014)
+
+ 08 Jul 2014; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.3.16 (23 Mar 2014)
+
+ 23 Mar 2014; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.3.15 (14 Mar 2014)
+
+ 14 Mar 2014; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.3.8 (30 Oct 2013)
+
+ 30 Oct 2013; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.2.53 (31 Jul 2013)
+
+ 31 Jul 2013; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.2.49 (31 Jul 2013)
+
+ 31 Jul 2013; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.2.43 (24 Aug 2013)
+
+ 24 Aug 2013; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.2.37 (07 Jun 2013)
+
+ 07 Jun 2013; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.2.25 (17 Mar 2013)
+
+ 17 Mar 2013; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.2.22 (12 Mar 2013)
+
+ 12 Mar 2013; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.2.16 (10 Feb 2013)
+
+ 10 Feb 2013; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.2.15 (01 Feb 2013)
+
+ 01 Feb 2013; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.2.13 (12 Jan 2013)
+
+ 12 Jan 2013; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.2.12 (25 Dec 2012)
+
+ 25 Dec 2012; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild Fix homepage
+
+*duckduckgo-0.2.9 (16 Dec 2012)
+
+ 16 Dec 2012; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.2.8-r1 (07 Dec 2012)
+
+ 07 Dec 2012; Martin Väth <martin@mvath.de>:
+ Fix download and rename ebuild to force a true bump
+
+*duckduckgo-0.2.8 (23 Nov 2012)
+
+ 23 Nov 2012; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*duckduckgo-0.2.7 (04 Nov 2012)
+
+ 04 Nov 2012; Martin Väth <martin@mvath.de>:
+ New ebuild
diff --git a/www-plugins/duckduckgo/Manifest b/www-plugins/duckduckgo/Manifest
index fce9e040..0e2cb5ec 100644
--- a/www-plugins/duckduckgo/Manifest
+++ b/www-plugins/duckduckgo/Manifest
@@ -1 +1 @@
-DIST duckduckgo_privacy_essentials-2018.10.24-an+fx.xpi 778443 SHA512 52a8865d8655630a125e212d52a2437aebd0d69306c543d7abb929238635f682200f5cd31dbf46648d9bcabacdf6d55791f89152a256318611c91c8b997d1e8e
+DIST duckduckgo_plus-0.4.6-fx.xpi 139159 SHA256 8f87ac100056396a35f07fbab422d2a09118745d50abb2c6859fb1a2dc9b741f SHA512 254dbb938f52b192d78ae6078239811e3a27dff5dd513c3670a483c4da538d7ea8180e29204604a369652111c56e89eda9682a61f1071ed5b8b701949de2acee WHIRLPOOL 159f86fae9d42afad0fa4d5c8a03acffabb6f0441863d3f10378176e3e24bf208c7867e05fcc312c2e7852d350c32bc39669d46410a0f5186b6ff9d300fe98f3
diff --git a/www-plugins/duckduckgo/duckduckgo-0.4.6-r1.ebuild b/www-plugins/duckduckgo/duckduckgo-0.4.6-r1.ebuild
new file mode 100644
index 00000000..ae803969
--- /dev/null
+++ b/www-plugins/duckduckgo/duckduckgo-0.4.6-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+MV_MOZ_MOZILLAS="firefox"
+inherit mv_mozextension
+RESTRICT="mirror"
+
+mPN="${PN}_plus-${PV}"
+DESCRIPTION="Firefox plugin: enable duckduckgo search engine"
+HOMEPAGE="http://addons.mozilla.org/en-US/firefox/addon/duckduckgo-for-firefox/"
+SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/385621/${mPN}-fx.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/www-plugins/duckduckgo/duckduckgo-2018.10.24.ebuild b/www-plugins/duckduckgo/duckduckgo-2018.10.24.ebuild
deleted file mode 100644
index 4a430c1b..00000000
--- a/www-plugins/duckduckgo/duckduckgo-2018.10.24.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2012-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-mPN="${PN}_privacy_essentials-${PV}"
-DESCRIPTION="Firefox webextension: privacy essentials, including duckduckgo search engine"
-HOMEPAGE="http://addons.mozilla.org/en-US/firefox/addon/duckduckgo-for-firefox/"
-SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/385621/${mPN}-an+fx.xpi"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-moz_defaults '>=firefox-57' seamonkey
diff --git a/www-plugins/duckduckgo/metadata.xml b/www-plugins/duckduckgo/metadata.xml
index b919c846..73a6d343 100644
--- a/www-plugins/duckduckgo/metadata.xml
+++ b/www-plugins/duckduckgo/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/www-plugins/epubreader/ChangeLog b/www-plugins/epubreader/ChangeLog
new file mode 100644
index 00000000..3bc3cf5d
--- /dev/null
+++ b/www-plugins/epubreader/ChangeLog
@@ -0,0 +1,46 @@
+# ChangeLog for www-plugins/epubreader
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*epubreader-1.5.0.6 (22 Apr 2015)
+
+ 17 Jul 2015; Martin Väth <martin@mvath.de>:
+ Use signed tarball
+
+ 22 Apr 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*epubreader-1.5.0.5 (16 Mar 2015)
+
+ 16 Mar 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*epubreader-1.5.0.4 (13 Feb 2015)
+
+ 13 Feb 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*epubreader-1.5.0.3 (02 Feb 2015)
+
+ 02 Feb 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*epubreader-1.5.0.1 (10 Jan 2015)
+
+ 10 Jan 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*epubreader-1.4.2.6 (05 Dec 2014)
+
+ 05 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*epubreader-1.4.2.5 (22 Aug 2014)
+
+ 22 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*epubreader-1.4.2.4 (25 Jan 2013)
+
+ 25 Jan 2013; Martin Väth <martin@mvath.de>:
+ New ebuild
diff --git a/www-plugins/epubreader/Manifest b/www-plugins/epubreader/Manifest
index c7262046..820c1895 100644
--- a/www-plugins/epubreader/Manifest
+++ b/www-plugins/epubreader/Manifest
@@ -1 +1 @@
-DIST epubreader-2.0.13-fx.xpi 192536 SHA512 77a5121d0cb8f2218a8291f04d8cceeb89adb12a3cb78a26a417797ee7a972d143a2997a5462665c392c2d487708942d9c8b1983bd65b14c9d726191a8f9934a
+DIST epubreader-1.5.0.6-sm+fx.xpi 251595 SHA256 d4139d19124f5644967d9f68b5b13e1da097ad8e44c58a06e49dfce502ab6b44 SHA512 df8d172808bdbdf80d4b860f6025ae64cc915f1dc9be37a5284c4cc3235b2e1a43424252b1d8084ef39dbdcb10f25e4e0275a3b840cf8edda2d77868decafcd4 WHIRLPOOL f90c2a62579500eadda56d61c0bb58017dd7467fe2a86a7c0f1d2b578a0233d571c7f9a19627842f810bbb9830462369fbd07d8f8638410c7b9cf14d028a4358
diff --git a/www-plugins/epubreader/epubreader-1.5.0.6-r1.ebuild b/www-plugins/epubreader/epubreader-1.5.0.6-r1.ebuild
new file mode 100644
index 00000000..bd6cffa2
--- /dev/null
+++ b/www-plugins/epubreader/epubreader-1.5.0.6-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit mv_mozextension
+RESTRICT="mirror"
+
+DESCRIPTION="Firefox plugin for ebook (.epub) files"
+HOMEPAGE="http://addons.mozilla.org/de/firefox/addon/epubreader/"
+SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/45281/${P}-sm+fx.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/www-plugins/epubreader/epubreader-2.0.13.ebuild b/www-plugins/epubreader/epubreader-2.0.13.ebuild
deleted file mode 100644
index c29d6e7a..00000000
--- a/www-plugins/epubreader/epubreader-2.0.13.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2014-2019 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox webextension: read ebook (.epub) files"
-HOMEPAGE="http://addons.mozilla.org/en-US/firefox/addon/epubreader/"
-SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/45281/${P}-fx.xpi"
-
-LICENSE="epubreader"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-moz_defaults -i'{5384767E-00D9-40E9-B72F-9CC39D655D6F}' firefox seamonkey
diff --git a/www-plugins/epubreader/metadata.xml b/www-plugins/epubreader/metadata.xml
index b919c846..73a6d343 100644
--- a/www-plugins/epubreader/metadata.xml
+++ b/www-plugins/epubreader/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/www-plugins/form-history-control/ChangeLog b/www-plugins/form-history-control/ChangeLog
new file mode 100644
index 00000000..2aa51e39
--- /dev/null
+++ b/www-plugins/form-history-control/ChangeLog
@@ -0,0 +1,126 @@
+# ChangeLog for www-plugins/form-history-control
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*form-history-control-1.4.0.4 (15 May 2015)
+
+ 17 Jul 2015; Martin Väth <martin@mvath.de>:
+ Use signed tarball
+
+ 15 May 2015; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.4.0.2 (31 Jan 2015)
+
+ 31 Jan 2015; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.3.3.0 (09 Feb 2014)
+
+ 09 Feb 2014; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.3.1.0 (14 Jul 2013)
+
+ 14 Jul 2013; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.3.0.6 (02 Mar 2013)
+
+ 02 Mar 2013; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.3.0.5 (18 Feb 2013)
+
+ 18 Feb 2013; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.3.0.3 (20 Nov 2012)
+
+ 20 Nov 2012; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.3.0.2-r1 (21 Sep 2012)
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5. Revision bump to force slot dependency
+
+*form-history-control-1.3.0.2 (20 Jul 2012)
+
+ 20 Jul 2012; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.3.0.1 (06 Jul 2012)
+
+ 06 Jul 2012; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.2.10.3 (07 May 2012)
+
+ 07 May 2012; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.2.10.2 (29 Jan 2012)
+
+ 29 Jan 2012; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.2.10.1 (30 Nov 2011)
+
+ 30 Nov 2011; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.2.10.0 (26 Nov 2011)
+
+ 26 Nov 2011; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.2.9.3 (30 Jul 2011)
+
+ 01 Aug 2011; Martin Väth <martin@mvath.de>:
+ Change to more stable URL
+
+ 30 Jul 2011; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.2.9.2 (26 Jun 2011)
+
+ 26 Jun 2011; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.2.9.1 (17 May 2011)
+
+ 17 May 2011; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.2.8.1 (15 Jan 2011)
+
+ 15 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.2.7 (17 Oct 2010)
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4
+
+ 25 Oct 2010; Martin Väth <martin@mvath.de>:
+ Bump properly. Remove old ebuild
+
+ 17 Oct 2010; Martin Väth <martin@mvath.de>:
+ Bump version from sandbox. It is not keyworded, since I did not test it!
+
+ 01 Aug 2010; Martin Väth <martin@mvath.de>:
+ Bump revision to force eclass upgrade
+
+ 31 Jul 2010; Martin Väth <martin@mvath.de>:
+ Bump revision to force eclass upgrade
+
+*form-history-control-1.2.6 (03 Jul 2010)
+
+ 03 Jul 2010; Martin Väth <martin@mvath.de>:
+ Bump version. Remove old ebuild
+
+*form-history-control-1.2.3 (13 Jun 2010)
+
+ 13 Jun 2010; Martin Väth <martin@mvath.de>:
+ New ebuild
diff --git a/www-plugins/form-history-control/Manifest b/www-plugins/form-history-control/Manifest
index 620288a8..16d578a6 100644
--- a/www-plugins/form-history-control/Manifest
+++ b/www-plugins/form-history-control/Manifest
@@ -1 +1 @@
-DIST form_history_control-2.5.1.0-an+fx.xpi 283580 SHA512 199a8f1f6c67be05682218b29acea5dbbeca43b12a60a0e618035978bd35d6778489d8748f5fbee687441edb15fdf392b21ea976cb84d6f8df6f8d1ed1df1574
+DIST form_history_control-1.4.0.4-sm+fx.xpi 500661 SHA256 ae421ade4005e5b12aa7c53cdc9f61cb53f61dfe3dd0e21cb64a1dd3a6c0d9c5 SHA512 ce9efa4d6dc9d3c15cf855191caf8303c72b3ba7c1e68c51c7d5105c15108d80f1316539ab1ce032b9f97d5af3d0bad887a9492f005de95e28342b48e3142284 WHIRLPOOL 7c199e64c688d0b94f9f21af24b55126ef38ec6ed079b8962aa9bf3c84611ba3f120b656fd86b4c46f13dab243bb5ac9caefe555f3feb1f37f1f1727b4cb2b1a
diff --git a/www-plugins/form-history-control/form-history-control-1.4.0.4-r1.ebuild b/www-plugins/form-history-control/form-history-control-1.4.0.4-r1.ebuild
new file mode 100644
index 00000000..bec8881a
--- /dev/null
+++ b/www-plugins/form-history-control/form-history-control-1.4.0.4-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit mv_mozextension
+RESTRICT="mirror"
+
+MY_P="${P/-/_}"
+MY_P="${MY_P/-/_}"
+NAME="${MY_P}-sm+fx.xpi"
+DESCRIPTION="Edit the saved history of forms in mozilla"
+HOMEPAGE="http://www.formhistory.blogspot.com/"
+SRC_URI="http://addons.cdn.mozilla.net/user-media/addons/12021/${NAME}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/www-plugins/form-history-control/form-history-control-2.5.1.0.ebuild b/www-plugins/form-history-control/form-history-control-2.5.1.0.ebuild
deleted file mode 100644
index 6ac1d624..00000000
--- a/www-plugins/form-history-control/form-history-control-2.5.1.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2010-2019 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox webextension: edit the saved history of forms"
-HOMEPAGE="http://www.formhistory.blogspot.com/"
-SRC_URI="https://addons.mozilla.org/firefox/downloads/file/769035/${PN//-/_}-${PV}-an+fx.xpi"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-moz_defaults firefox seamonkey
diff --git a/www-plugins/form-history-control/metadata.xml b/www-plugins/form-history-control/metadata.xml
index b919c846..73a6d343 100644
--- a/www-plugins/form-history-control/metadata.xml
+++ b/www-plugins/form-history-control/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/www-plugins/google-translation/Manifest b/www-plugins/google-translation/Manifest
deleted file mode 100644
index 554e8dd0..00000000
--- a/www-plugins/google-translation/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST google_translation-2.6-an+fx.xpi 15349 SHA512 b781a1ef0446b24c7aad36cb025ee7a28994c89862f1cd0479d6a051c5f53dc37c2887dbdbacedeb8d114dafa8db004c6cbb6dc25dbbc69377df57b9a7ab605f
diff --git a/www-plugins/google-translation/google-translation-2.6.ebuild b/www-plugins/google-translation/google-translation-2.6.ebuild
deleted file mode 100644
index f819ab87..00000000
--- a/www-plugins/google-translation/google-translation-2.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2017-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox webextension: translate to your native language a selected text"
-HOMEPAGE="https://addons.mozilla.org/en-US/firefox/addon/google-translation/"
-SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/727175/${PN//-/_}-${PV}-an+fx.xpi"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-INSTALL_ID='gtranslation2@slam.com'
-
-moz_defaults -i"${INSTALL_ID}" firefox seamonkey
diff --git a/www-plugins/google-translation/metadata.xml b/www-plugins/google-translation/metadata.xml
deleted file mode 100644
index b919c846..00000000
--- a/www-plugins/google-translation/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
-</pkgmetadata>
diff --git a/www-plugins/google-translator-for-firefox/Manifest b/www-plugins/google-translator-for-firefox/Manifest
deleted file mode 100644
index b8615fba..00000000
--- a/www-plugins/google-translator-for-firefox/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST google_translator_for_firefox-3.0.3.3-fx.xpi 68859 SHA512 671c7f850acf96e8b93411e51ea75c9bcae549f35330f0f347e184b9fd434eb6520d21e4c96f84ddfc38990ba45bc9b8466d4dfa81d3a0a61cbaa2828d45a3f4
diff --git a/www-plugins/google-translator-for-firefox/google-translator-for-firefox-3.0.3.3.ebuild b/www-plugins/google-translator-for-firefox/google-translator-for-firefox-3.0.3.3.ebuild
deleted file mode 100644
index 3ab0b182..00000000
--- a/www-plugins/google-translator-for-firefox/google-translator-for-firefox-3.0.3.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox webextension: translate text or page with google translator"
-HOMEPAGE="https://addons.mozilla.org/en-US/firefox/addon/google-translator-for-firefox/
-https://translatorforfirefox.blogspot.com/"
-SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/46308/google_translator_for_firefox-${PV}-fx.xpi"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-moz_defaults firefox seamonkey
diff --git a/www-plugins/google-translator-for-firefox/metadata.xml b/www-plugins/google-translator-for-firefox/metadata.xml
deleted file mode 100644
index b919c846..00000000
--- a/www-plugins/google-translator-for-firefox/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
-</pkgmetadata>
diff --git a/www-plugins/https-everywhere/Manifest b/www-plugins/https-everywhere/Manifest
deleted file mode 100644
index a13aaaba..00000000
--- a/www-plugins/https-everywhere/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST https_everywhere-2018.10.31-an+fx.xpi 1766292 SHA512 ed28236cd3e418cb2c7478a4a3bdddfcca8beb49a4f23f3b3a721fa26a9daa8c292f922a2782195995364a3a45062f9cd733d200ed356fe0633164d6bb9593be
diff --git a/www-plugins/https-everywhere/https-everywhere-2018.10.31.ebuild b/www-plugins/https-everywhere/https-everywhere-2018.10.31.ebuild
deleted file mode 100644
index 430ff03b..00000000
--- a/www-plugins/https-everywhere/https-everywhere-2018.10.31.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2017-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox webextension: force https for all websites of a provided list"
-HOMEPAGE="https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/"
-SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/229918/${PN//-/_}-${PV}-an+fx.xpi"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-moz_defaults firefox seamonkey
diff --git a/www-plugins/https-everywhere/metadata.xml b/www-plugins/https-everywhere/metadata.xml
deleted file mode 100644
index b919c846..00000000
--- a/www-plugins/https-everywhere/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
-</pkgmetadata>
diff --git a/www-plugins/locale-switcher/ChangeLog b/www-plugins/locale-switcher/ChangeLog
new file mode 100644
index 00000000..d13c0096
--- /dev/null
+++ b/www-plugins/locale-switcher/ChangeLog
@@ -0,0 +1,16 @@
+# ChangeLog for www-plugins/locale-switcher
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*locale-switcher-3-r1 (21 Sep 2012)
+
+ 17 Jul 2015; Martin Väth <martin@mvath.de>:
+ Use signed tarball
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5. Revision bump to force slot dependency
+
+*locale-switcher-3 (02 Apr 2012)
+
+ 02 Apr 2012; Martin Väth <martin@mvath.de>:
+ New ebuild
diff --git a/www-plugins/locale-switcher/Manifest b/www-plugins/locale-switcher/Manifest
new file mode 100644
index 00000000..a79ed2f1
--- /dev/null
+++ b/www-plugins/locale-switcher/Manifest
@@ -0,0 +1 @@
+DIST locale_switcher-3-fx.xpi 6853 SHA256 b48be1cc5570c646e233a27300988f1dc6e7c978cdee0bab9e5cce4777d14161 SHA512 c4b657b5f9ee5007d7f5a89fdf451a5eb613180d2833c38f21a230d823b84098497dd06c0c1dd8e45b59e437250ffba32946a40c35051527268605993b243786 WHIRLPOOL 011d5016fd82fb73bf889a14c93c412c9b698bdb492c1a330161ab2a8899dd4fc6c4d0b21bfe3c5029cbfe7efa0d34610def4d15838ed72727df25bd9a97a54e
diff --git a/www-plugins/locale-switcher/locale-switcher-3-r1.ebuild b/www-plugins/locale-switcher/locale-switcher-3-r1.ebuild
new file mode 100644
index 00000000..25e85e97
--- /dev/null
+++ b/www-plugins/locale-switcher/locale-switcher-3-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit mv_mozextension
+RESTRICT="mirror"
+
+MY_P="${P/-/_}"
+NAME="${MY_P}-fx.xpi"
+DESCRIPTION="Firefox plugin: button to switch GUI locale"
+HOMEPAGE="http://addons.mozilla.org/firefox/addon/locale-switcher/"
+SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/356/${NAME}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/games-rpg/aklabeth/metadata.xml b/www-plugins/locale-switcher/metadata.xml
index b919c846..73a6d343 100644
--- a/games-rpg/aklabeth/metadata.xml
+++ b/www-plugins/locale-switcher/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/www-plugins/no-color/Manifest b/www-plugins/no-color/Manifest
deleted file mode 100644
index d34ea766..00000000
--- a/www-plugins/no-color/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST no_color-0.9.4-an+fx.xpi 13809 SHA512 aa170a1ead1d94c05392651f927a4651b66e617a6961acf71805de14258bd75e0d36ccce59950d56a56404a20a04860c2f29588ae3b2d837096313c1a00efb8f
diff --git a/www-plugins/no-color/metadata.xml b/www-plugins/no-color/metadata.xml
deleted file mode 100644
index b919c846..00000000
--- a/www-plugins/no-color/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
-</pkgmetadata>
diff --git a/www-plugins/no-color/no-color-0.9.4.ebuild b/www-plugins/no-color/no-color-0.9.4.ebuild
deleted file mode 100644
index 99382e8a..00000000
--- a/www-plugins/no-color/no-color-0.9.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2017-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox webextension: remove colors and background images from the page"
-HOMEPAGE="https://addons.mozilla.org/en-US/firefox/addon/no-color/"
-SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/5758/${PN//-/_}-${PV}-an+fx.xpi"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-moz_defaults firefox seamonkey
diff --git a/www-plugins/noscript/ChangeLog b/www-plugins/noscript/ChangeLog
new file mode 100644
index 00000000..0a9d6a1b
--- /dev/null
+++ b/www-plugins/noscript/ChangeLog
@@ -0,0 +1,273 @@
+# ChangeLog for www-plugins/noscript
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*noscript-2.6.9.37 (02 Oct 2015)
+
+ 02 Oct 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.36 (30 Aug 2015)
+
+ 30 Aug 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.34 (05 Aug 2015)
+
+ 05 Aug 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.33 (31 Jul 2015)
+
+ 31 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.31 (17 Jul 2015)
+
+ 17 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.27 (26 Jun 2015)
+
+ 26 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.26 (07 Jun 2015)
+
+ 07 Jun 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.24 (24 May 2015)
+
+ 24 May 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.22 (22 Apr 2015)
+
+ 22 Apr 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.21 (12 Apr 2015)
+
+ 12 Apr 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.20 (01 Apr 2015)
+
+ 01 Apr 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.19 (21 Mar 2015)
+
+ 21 Mar 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.18 (15 Mar 2015)
+
+ 15 Mar 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.17 (10 Mar 2015)
+
+ 10 Mar 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.15 (20 Feb 2015)
+
+ 20 Feb 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.13 (13 Feb 2015)
+
+ 13 Feb 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.12 (07 Feb 2015)
+
+ 07 Feb 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.11 (18 Jan 2015)
+
+ 18 Jan 2015; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.10 (31 Dec 2014)
+
+ 31 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.8 (23 Dec 2014)
+
+ 23 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.7 (16 Dec 2014)
+
+ 16 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.6 (05 Dec 2014)
+
+ 05 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.5 (28 Nov 2014)
+
+ 28 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.4 (16 Nov 2014)
+
+ 16 Nov 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.3 (26 Oct 2014)
+
+ 26 Oct 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9.2 (19 Oct 2014)
+
+ 19 Oct 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.9 (07 Oct 2014)
+
+ 07 Oct 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.42 (22 Sep 2014)
+
+ 22 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.41 (13 Sep 2014)
+
+ 13 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.40 (07 Sep 2014)
+
+ 07 Sep 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.39 (27 Aug 2014)
+
+ 27 Aug 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.36 (29 Jul 2014)
+
+ 29 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.35 (25 Jul 2014)
+
+ 25 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.34 (20 Jul 2014)
+
+ 20 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump
+
+*noscript-2.6.8.33 (08 Jul 2014)
+
+ 08 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.31 (04 Jul 2014)
+
+ 04 Jul 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.29 (29 Jun 2014)
+
+ 29 Jun 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.28 (03 Jun 2014)
+
+ 03 Jun 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.26 (29 May 2014)
+
+ 29 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.25 (24 May 2014)
+
+ 24 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.24 (17 May 2014)
+
+ 17 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.23 (05 May 2014)
+
+ 05 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.21 (04 May 2014)
+
+ 04 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.20 (17 Apr 2014)
+
+ 17 Apr 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.19 (06 Apr 2014)
+
+ 06 Apr 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.18 (23 Mar 2014)
+
+ 23 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.17 (08 Mar 2014)
+
+ 08 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.16 (01 Mar 2014)
+
+ 01 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.15 (24 Feb 2014)
+
+ 24 Feb 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.14 (14 Feb 2014)
+
+ 14 Feb 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.13 (22 Jan 2014)
+
+ 22 Jan 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.12 (20 Jan 2014)
+
+ 20 Jan 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.11 (09 Jan 2014)
+
+ 09 Jan 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*noscript-2.6.8.10 (02 Jan 2014)
+
+ 02 Jan 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Clear ChangeLog
diff --git a/www-plugins/noscript/Manifest b/www-plugins/noscript/Manifest
index 9d727846..92a78a5c 100644
--- a/www-plugins/noscript/Manifest
+++ b/www-plugins/noscript/Manifest
@@ -1 +1 @@
-DIST noscript-11.0.36.xpi 588357 SHA512 e91648423328c37cef484f646e02adee43c962c0da9f632db1cd594191875d3037626909f09aa954432ac2171c4046bbe56b3f3796fe9b7e6fef4eaa58fce642
+DIST noscript-2.6.9.37.xpi 562140 SHA256 36ca0cbffef01ff480d391bd1f6b6d627d64147650523a6e7915a5a0d555dd0f SHA512 6983b9204838cdbefce5c301bb636ab7011618ab1cc3e42c36776ebeb290a24ee16ff21324006f9c504cea2a8f551547cf2ef6711799ecef6319a274319e2635 WHIRLPOOL 579607d5c94d973db22a8b792d3459006742aee7806b8619004dff717ccb3dce4742480dafeda763a3996e65fb8ea3dbf6f789fcceacac3b0debb3ab21da3f6c
diff --git a/www-plugins/noscript/metadata.xml b/www-plugins/noscript/metadata.xml
index 11792c08..935424a8 100644
--- a/www-plugins/noscript/metadata.xml
+++ b/www-plugins/noscript/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
+ <maintainer>
<email>martin@mvath.de</email>
<name>Martin Väth</name>
</maintainer>
diff --git a/www-plugins/noscript/noscript-11.0.36.ebuild b/www-plugins/noscript/noscript-11.0.36.ebuild
deleted file mode 100644
index a9de8f58..00000000
--- a/www-plugins/noscript/noscript-11.0.36.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2010-2019 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox webextension: restrict active contents like java/javascript/flash"
-HOMEPAGE="http://noscript.net/"
-SRC_URI="https://secure.informaction.com/download/releases/${P}.xpi
-https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-${PV}-an+fx.xpi -> ${P}.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-moz_defaults '>=firefox-59' seamonkey
diff --git a/www-plugins/noscript/noscript-2.6.9.37.ebuild b/www-plugins/noscript/noscript-2.6.9.37.ebuild
new file mode 100644
index 00000000..d51ee087
--- /dev/null
+++ b/www-plugins/noscript/noscript-2.6.9.37.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit mv_mozextension
+RESTRICT="mirror"
+
+DESCRIPTION="Mozilla plugin: Restrict active contents like java/javascript/flash"
+HOMEPAGE="http://noscript.net/"
+SRC_URI="https://secure.informaction.com/download/releases/${P}.xpi
+https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-${PV}-sm+fx+fn.xpi -> ${P}.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# NOTES:
+# can also be used for Flock, MidBrowser, eMusic, Toolkit, Songbird, Fennec
diff --git a/www-plugins/requestpolicy/ChangeLog b/www-plugins/requestpolicy/ChangeLog
new file mode 100644
index 00000000..0aca31d3
--- /dev/null
+++ b/www-plugins/requestpolicy/ChangeLog
@@ -0,0 +1,31 @@
+# ChangeLog for www-plugins/requestpolicy
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*requestpolicy-0.5.28 (31 Jul 2013)
+
+ 17 Jul 2015; Martin Väth <martin@mvath.de>:
+ Use signed tarball
+
+ 31 Jul 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*requestpolicy-0.5.27-r1 (21 Sep 2012)
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5. Revision bump to force slot dependency
+
+*requestpolicy-0.5.27 (20 Jul 2012)
+
+ 20 Jul 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*requestpolicy-0.5.26 (06 Jul 2012)
+
+ 06 Jul 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*requestpolicy-0.5.25 (13 Apr 2012)
+
+ 13 Apr 2012; Martin Väth <martin@mvath.de>:
+ new ebuild from scratch
diff --git a/www-plugins/requestpolicy/Manifest b/www-plugins/requestpolicy/Manifest
new file mode 100644
index 00000000..5be4c531
--- /dev/null
+++ b/www-plugins/requestpolicy/Manifest
@@ -0,0 +1 @@
+DIST requestpolicy-0.5.28-sm+fx.xpi 165630 SHA256 f23b90aa6795ce6a9343a29d79b93c2fb6fa83b5c7b1e80ce829ee8446962bc9 SHA512 27cdb397eb16ba8ca1ae841020893e11b1f8ac857a950f5528dc914c47c417a3c77c3779f82bcdbc0f45eff02b9b573d8f705826ac4ffe4d1c10c930152c1e37 WHIRLPOOL 387fe8b42c0a4381df500c903ba59404b981a4b15f6d9429f0613c09d5d6c1e61c0e227c2e26b39de9984f9ac28870ca60c488ea929fc966f70186f3d33717fc
diff --git a/www-plugins/requestpolicy/metadata.xml b/www-plugins/requestpolicy/metadata.xml
new file mode 100644
index 00000000..73a6d343
--- /dev/null
+++ b/www-plugins/requestpolicy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>martin@mvath.de</email>
+ <name>Martin Väth</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/www-plugins/requestpolicy/requestpolicy-0.5.28-r1.ebuild b/www-plugins/requestpolicy/requestpolicy-0.5.28-r1.ebuild
new file mode 100644
index 00000000..63d4ca17
--- /dev/null
+++ b/www-plugins/requestpolicy/requestpolicy-0.5.28-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit mv_mozextension
+RESTRICT="mirror"
+
+DESCRIPTION="Mozilla plugin: Increases privacy and security by giving you control over cross-site requests"
+HOMEPAGE="https://www.requestpolicy.com/"
+SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/9727/${P}-sm+fx.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/www-plugins/shumway/ChangeLog b/www-plugins/shumway/ChangeLog
new file mode 100644
index 00000000..a7d1ec58
--- /dev/null
+++ b/www-plugins/shumway/ChangeLog
@@ -0,0 +1,23 @@
+# ChangeLog for www-plugins/shumway
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*shumway-0.11.394 (17 Jul 2015)
+
+ 17 Jul 2015; Martin Väth <martin@mvath.de>:
+ Version bump. Remove old ebuild
+
+*shumway-0.11.116 (30 Apr 2015)
+
+ 30 Apr 2015; Martin Väth <martin@mvath.de>:
+ Version bump. Remove old ebuild
+
+*shumway-0.10.337 (01 Apr 2015)
+
+ 01 Apr 2015; Martin Väth <martin@mvath.de>:
+ new version from scratch. Since mozilla does not version the tarball,
+ and I do not bump very often, you will likely get checksum errors
+ when downloading.
+ It is necessary to copy the ebuild (probably together with the
+ mv_mozextension.eclass) in your local overlay and bump on your own.
+ Blame mozilla for this broken policy but not me...
diff --git a/www-plugins/shumway/Manifest b/www-plugins/shumway/Manifest
new file mode 100644
index 00000000..de738827
--- /dev/null
+++ b/www-plugins/shumway/Manifest
@@ -0,0 +1 @@
+DIST shumway-0.11.394.xpi 668441 SHA256 0943f4bc4cbd4391c11aa8141fcef02005d16b6a8d4beed559a2db320993d6a7 SHA512 1cb21d4c8fe319204a3764cce034d31f58cc0cac7e53fd8a9ed660787eab59a74626bc41c6d3f94c154f3305f425b384a3f648b9a8d701b82dc440541f436463 WHIRLPOOL e8b077c721fe9aab9a11e930d99834510fb7955a79834d4b100a4ab80ae9179e0a706d690d39e12671bf552113fd7abd39b9e76eed27e395f5c2c563c42ba38c
diff --git a/www-plugins/shumway/metadata.xml b/www-plugins/shumway/metadata.xml
new file mode 100644
index 00000000..73a6d343
--- /dev/null
+++ b/www-plugins/shumway/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>martin@mvath.de</email>
+ <name>Martin Väth</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/www-plugins/shumway/shumway-0.11.394.ebuild b/www-plugins/shumway/shumway-0.11.394.ebuild
new file mode 100644
index 00000000..211ca313
--- /dev/null
+++ b/www-plugins/shumway/shumway-0.11.394.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://github.com/mozilla/shumway.git"
+inherit mv_mozextension
+#inherit git-r3
+
+DESCRIPTION="Mozilla plugin: Flashplayer emulation with javascript and html5"
+HOMEPAGE="http://mozilla.github.io/shumway/"
+SRC_URI="http://mozilla.github.io/shumway/extension/firefox/${PN}.xpi -> ${P}.xpi"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/www-plugins/skip-redirect/Manifest b/www-plugins/skip-redirect/Manifest
deleted file mode 100644
index 62253a30..00000000
--- a/www-plugins/skip-redirect/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST skip_redirect-2.2.1-fx.xpi 60802 SHA512 c9ad8ee4a9c139e9ba59313a7c03223b28489a9cbdca7a92862256267f284fb9a4de4086e549afac08149ef2510a351878f3baaaeaadd119b2514aea162a0ff1
diff --git a/www-plugins/skip-redirect/metadata.xml b/www-plugins/skip-redirect/metadata.xml
deleted file mode 100644
index b919c846..00000000
--- a/www-plugins/skip-redirect/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
-</pkgmetadata>
diff --git a/www-plugins/skip-redirect/skip-redirect-2.2.1.ebuild b/www-plugins/skip-redirect/skip-redirect-2.2.1.ebuild
deleted file mode 100644
index 91d61968..00000000
--- a/www-plugins/skip-redirect/skip-redirect-2.2.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2017-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox webextension: skip intermediary pages before redirecting"
-HOMEPAGE="https://addons.mozilla.org/en-US/firefox/addon/skip-redirect/
-https://github.com/sblask/webextension-skip-redirect"
-SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/642100/${PN//-/_}-${PV}-fx.xpi"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-moz_defaults firefox seamonkey
diff --git a/www-plugins/stylish/ChangeLog b/www-plugins/stylish/ChangeLog
new file mode 100644
index 00000000..57683876
--- /dev/null
+++ b/www-plugins/stylish/ChangeLog
@@ -0,0 +1,152 @@
+# ChangeLog for www-plugins/stylish
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*stylish-2.0.2 (02 Mar 2015)
+
+ 02 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-2.0.1 (26 Jan 2015)
+
+ 26 Jan 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-2.0.0 (12 Dec 2014)
+
+ 12 Dec 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.4.3 (04 May 2014)
+
+ 04 May 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.4.2 (01 Mar 2014)
+
+ 01 Mar 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.4.1 (31 Jan 2014)
+
+ 31 Jan 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.4.0 (16 Nov 2013)
+
+ 24 Jan 2014; Martin Väth <martin@mvath.de>:
+ Avoid duplicate installation
+
+ 16 Nov 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.3.3 (31 Aug 2013)
+
+ 12 Oct 2013; Martin Väth <martin@mvath.de>:
+ Use readme.gentoo.eclass
+
+ 31 Aug 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.3.2 (19 Apr 2013)
+
+ 19 Apr 2013; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.3.1 (23 Nov 2012)
+
+ 23 Nov 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.3-r1 (21 Sep 2012)
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5. Revision bump to force slot dependency
+
+*stylish-1.3 (08 Sep 2012)
+
+ 08 Sep 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.2.6 (28 Feb 2012)
+
+ 10 Mar 2012; Martin Väth <martin@mvath.de>:
+ Homepage without variable
+
+ 28 Feb 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.2.5 (25 Jan 2012)
+
+ 25 Jan 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.2.4 (08 Nov 2011)
+
+ 08 Nov 2011; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.2.3 (29 Sep 2011)
+
+ 29 Sep 2011; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.2.2 (09 Sep 2011)
+
+ 09 Sep 2011; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.2.1 (22 Aug 2011)
+
+ 22 Aug 2011; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.2 (26 Jun 2011)
+
+ 26 Jun 2011; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.1.2 (16 Apr 2011)
+
+ 16 Apr 2011; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.1.1 (02 Mar 2011)
+
+ 02 Mar 2011; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.1 (02 Feb 2011)
+
+ 02 Feb 2011; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.0.11 (14 Aug 2010)
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4
+
+ 14 Aug 2010; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+ 01 Aug 2010; Martin Väth <martin@mvath.de>:
+ Bump revision to force eclass upgrade
+
+ 31 Jul 2010; Martin Väth <martin@mvath.de>:
+ Bump revision to force eclass upgrade
+
+*stylish-1.0.9 (31 Jul 2010)
+
+ 06 Jun 2010; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild. Switch to new mv_mozextension.eclass:
+ Installs also for other mozilla variants like seamonkey
+
+*stylish-1.0.8 (02 Apr 2010)
+
+ 02 Apr 2010; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*stylish-1.0.7 (28 Mar 2010)
+
+ 28 Mar 2010; Martin Väth <martin@mvath.de>:
+ import with minor changes from a personal overlay
diff --git a/www-plugins/stylish/Manifest b/www-plugins/stylish/Manifest
new file mode 100644
index 00000000..09a7b394
--- /dev/null
+++ b/www-plugins/stylish/Manifest
@@ -0,0 +1 @@
+DIST stylish-2.0.2-fx+an+sm+tb.xpi 220522 SHA256 a75a6ecd0c70b45d869839167af5084d5498b8e6db461890732062d853f10616 SHA512 bc231d429b92a80c2000db10d01327bdd90d20e5115781948875e197dfe04be1ff22b89fb06d7d3777f919a3aea580cdc3753419995cd8d978bce64f13241fe3 WHIRLPOOL eb4c056942f43bf04ca703f7e8bde844215193c8865f85593f3854a0dfa04af67b7d479c1d3b536f7ce49a0cffec62c13798c575b7779ffedf3a94cd585ea269
diff --git a/www-plugins/stylish/metadata.xml b/www-plugins/stylish/metadata.xml
new file mode 100644
index 00000000..73a6d343
--- /dev/null
+++ b/www-plugins/stylish/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>martin@mvath.de</email>
+ <name>Martin Väth</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/www-plugins/stylish/stylish-2.0.2-r1.ebuild b/www-plugins/stylish/stylish-2.0.2-r1.ebuild
new file mode 100644
index 00000000..94093c03
--- /dev/null
+++ b/www-plugins/stylish/stylish-2.0.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit mv_mozextension readme.gentoo
+RESTRICT="mirror"
+
+DESCRIPTION="Mozilla plugin to modify style of certain web pages (e.g. Gentoo forums)"
+HOMEPAGE="https://addons.mozilla.org/firefox/addon/stylish/"
+SRC_URI="http://addons.cdn.mozilla.net/user-media/addons/2108/${P}-fx+an+sm+tb.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="You will probably want to setup the \"Darker forum\" style.
+The old version could be found at
+ http://jesgue.homelinux.org/other-files/dark-gentoo-forums.css
+but meanwhile it is easier to surf with javascript activated to
+ http://userstyles.org/users/8172
+Note that you have to temporarily disable noscript for that site."
+
+src_install() {
+ mv_mozextension_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_pkg_postinst
+}
diff --git a/www-plugins/translate-to-me/Manifest b/www-plugins/translate-to-me/Manifest
deleted file mode 100644
index aabd1f90..00000000
--- a/www-plugins/translate-to-me/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST translate_to_me-1.1.xpi 10291 SHA256 a5facd8c002296077e8271b3d5f4dae9929188d74ce77b1b3b4b617cd926aead SHA512 0cf6ffa0e0df6ca82595f0205a843eca7b553a68c3209710c3280d847b6d1910d5fbd46978e0ce769bbd7dd0c92d15f51b4b1350c4dc58e961622bf48b242cda
diff --git a/www-plugins/translate-to-me/metadata.xml b/www-plugins/translate-to-me/metadata.xml
deleted file mode 100644
index b919c846..00000000
--- a/www-plugins/translate-to-me/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
-</pkgmetadata>
diff --git a/www-plugins/translate-to-me/translate-to-me-1.1.ebuild b/www-plugins/translate-to-me/translate-to-me-1.1.ebuild
deleted file mode 100644
index 33d75b2a..00000000
--- a/www-plugins/translate-to-me/translate-to-me-1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2017-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox webextension: translate the selected text with www.linguee.com"
-HOMEPAGE="https://addons.mozilla.org/en-US/firefox/addon/traduza-para-mim/"
-SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/759684/traduza_para_mim-${PV}-an+fx.xpi -> translate_to_me-${PV}.xpi"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-INSTALL_ID='{e415fbdf-7d9b-4c89-bbf2-be52b470b1c1}'
-
-moz_defaults -i"${INSTALL_ID}" firefox seamonkey
diff --git a/www-plugins/ublock-origin/Manifest b/www-plugins/ublock-origin/Manifest
deleted file mode 100644
index b28fbfbf..00000000
--- a/www-plugins/ublock-origin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ublock_origin-1.17.2-an+fx.xpi 2368387 SHA512 8923b32abe933421451e8517754edcb1dd81cc8786eb50b3216a152784bad444ef1db59d7ae59318207237d8028298e0d51303301ef9f1971a0578cd7502ebc9
diff --git a/www-plugins/ublock-origin/metadata.xml b/www-plugins/ublock-origin/metadata.xml
deleted file mode 100644
index b919c846..00000000
--- a/www-plugins/ublock-origin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- </maintainer>
-</pkgmetadata>
diff --git a/www-plugins/ublock-origin/ublock-origin-1.17.2.ebuild b/www-plugins/ublock-origin/ublock-origin-1.17.2.ebuild
deleted file mode 100644
index 31dbff13..00000000
--- a/www-plugins/ublock-origin/ublock-origin-1.17.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2017-2018 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mv_mozextension-r1
-RESTRICT="mirror"
-
-DESCRIPTION="Firefox webextension: An efficient list-based blocker"
-HOMEPAGE="https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/"
-SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/607454/${PN//-/_}-${PV}-an+fx.xpi"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-moz_defaults firefox seamonkey
diff --git a/www-plugins/xclear/ChangeLog b/www-plugins/xclear/ChangeLog
new file mode 100644
index 00000000..7641f6cc
--- /dev/null
+++ b/www-plugins/xclear/ChangeLog
@@ -0,0 +1,50 @@
+# ChangeLog for www-plugins/xclear
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*xclear-1.8-r2 (17 Jul 2015)
+
+ 17 Jul 2015; Martin Väth <martin@mvath.de>:
+ Use signed tarball
+
+*xclear-1.8-r1 (21 Sep 2012)
+
+ 21 Sep 2012; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=5. Revision bump to force slot dependency
+
+*xclear-1.8 (23 Mar 2012)
+
+ 02 Apr 2012; Martin Väth <martin@mvath.de>:
+ Fix homepage
+
+ 23 Mar 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*xclear-1.7 (10 Mar 2012)
+
+ 10 Mar 2012; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*xclear-1.6 (20 Dec 2011)
+
+ 20 Dec 2011; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*xclear-1.4 (21 Mar 2011)
+
+ 21 Mar 2011; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*xclear-1.3 (13 Jun 2010)
+
+ 03 Jan 2011; Martin Väth <martin@mvath.de>:
+ Bump to EAPI=4
+
+ 01 Aug 2010; Martin Väth <martin@mvath.de>:
+ Bump revision to force eclass upgrade
+
+ 31 Jul 2010; Martin Väth <martin@mvath.de>:
+ Bump revision to force eclass upgrade
+
+ 13 Jun 2010; Martin Väth <martin@mvath.de>:
+ New ebuild
diff --git a/www-plugins/xclear/Manifest b/www-plugins/xclear/Manifest
new file mode 100644
index 00000000..2d18d296
--- /dev/null
+++ b/www-plugins/xclear/Manifest
@@ -0,0 +1 @@
+DIST xclear-1.8-sm+fx.xpi 8321 SHA256 2abd35ab7bdb4df7d97e70ddcd406d562984a150074b16296304f9a13ae43abd SHA512 3b1c5b84e3709a2cd670a54c2f268acaf188df57c2f17e76d7e712aedb8784145783a5d28f8e40ca355504585915c22e1d3eb73d49ab6e380b7cc49a8c01a1e8 WHIRLPOOL 4781ca1c9f037daeae2780368fc660b7fe38554d2dc8dc650f71972cc976d3844036544a76ac00683755d9babcc6a12efda4b89aa793759ded59f05a6289ba11
diff --git a/www-plugins/xclear/metadata.xml b/www-plugins/xclear/metadata.xml
new file mode 100644
index 00000000..73a6d343
--- /dev/null
+++ b/www-plugins/xclear/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>martin@mvath.de</email>
+ <name>Martin Väth</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/www-plugins/xclear/xclear-1.8-r2.ebuild b/www-plugins/xclear/xclear-1.8-r2.ebuild
new file mode 100644
index 00000000..4aca66a8
--- /dev/null
+++ b/www-plugins/xclear/xclear-1.8-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit mv_mozextension
+RESTRICT="mirror"
+
+DESCRIPTION="Firefox plugin: button to clear URL"
+HOMEPAGE="http://addons.mozilla.org/firefox/addon/xclear/"
+SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/13078/${P}-sm+fx.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
new file mode 100644
index 00000000..07bfa661
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for x11-drivers/nvidia-drivers
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*nvidia-drivers-173.14.39-r1 (10 Nov 2014)
+
+ 20 Nov 2014; Martin Väth <martin@mvath.de>:
+ Work smoothly with >=ccache-3.2
+
+ 10 Nov 2014; Martin Väth <martin@mvath.de>:
+ Bump from tree to add support for some newer kernel. Remove previous history
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
new file mode 100644
index 00000000..d26f875f
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -0,0 +1,3 @@
+DIST NVIDIA-FreeBSD-x86-173.14.39.tar.gz 20038266 SHA256 63a922ce4c5b676b4cb1ace98094dace4cc5408f2553e183df7b2127777a238b SHA512 96982fe7e0751c52fbef534193de09d187b99c1984c05e791223eb804719d8b3ba72efd983f227661ded4b71569bdbb914f1f629ab73a8bc9b8172832ccf3ec6 WHIRLPOOL 21f5906f42adf0064c7a7f81ac8e323de488e6d36356ee42c31a15c31ebb64335d5e2cff0ff022d41de480f9e0a57b3b96387f17151c7b59eceba2c61a7a102b
+DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
+DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
diff --git a/x11-drivers/nvidia-drivers/files/173.14.39-grsecurity.patch b/x11-drivers/nvidia-drivers/files/173.14.39-grsecurity.patch
new file mode 100644
index 00000000..7c9e60d3
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/173.14.39-grsecurity.patch
@@ -0,0 +1,47 @@
+--- 1/usr/src/nv/nv-linux.h
++++ 1/usr/src/nv/nv-linux.h
+@@ -668,10 +668,10 @@
+ 0, 0, NULL, NULL); \
+ }
+ #elif (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
+-#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type) \
++#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags) \
+ { \
+ kmem_cache = kmem_cache_create(name, sizeof(type), \
+- 0, 0, NULL); \
++ 0, flags, NULL); \
+ }
+ #else
+ #error "NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT value unrecognized!"
+--- 1/usr/src/nv/nv.c
++++ 1/usr/src/nv/nv.c
+@@ -389,7 +389,11 @@
+
+ /* character driver entry points */
+
++#ifndef __no_const
+ static struct file_operations nv_fops = {
++#else
++static file_operations_no_const nv_fops = {
++#endif
+ .owner = THIS_MODULE,
+ .poll = nv_kern_poll,
+ #if defined(NV_FILE_OPERATIONS_HAS_IOCTL)
+@@ -1377,7 +1381,7 @@
+ NV_SPIN_LOCK_INIT(&km_lock);
+ #endif
+
+- NV_KMEM_CACHE_CREATE(nv_stack_t_cache, "nv_stack_t", nv_stack_t);
++ NV_KMEM_CACHE_CREATE(nv_stack_t_cache, "nv_stack_t", nv_stack_t, SLAB_USERCOPY);
+ if (nv_stack_t_cache == NULL)
+ {
+ nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
+@@ -1499,7 +1503,7 @@
+ }
+ #endif
+
+- NV_KMEM_CACHE_CREATE(nv_pte_t_cache, "nv_pte_t", nv_pte_t);
++ NV_KMEM_CACHE_CREATE(nv_pte_t_cache, "nv_pte_t", nv_pte_t, 0);
+ if (nv_pte_t_cache == NULL)
+ {
+ rc = -ENOMEM;
diff --git a/x11-drivers/nvidia-drivers/files/173.14.39-kernel-3.13.patch b/x11-drivers/nvidia-drivers/files/173.14.39-kernel-3.13.patch
new file mode 100644
index 00000000..a11b3cb2
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/173.14.39-kernel-3.13.patch
@@ -0,0 +1,12 @@
+--- 1/usr/src/nv/nvacpi.c
++++ 1/usr/src/nv/nvacpi.c
+@@ -259,7 +259,9 @@ static int nv_acpi_remove(struct acpi_device *device, int type)
+
+ if (pNvAcpiObject->notify_handler_installed)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
++#endif
+
+ // remove event notifier
+ status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
diff --git a/x11-drivers/nvidia-drivers/files/173.14.39-kernel-3.14.patch b/x11-drivers/nvidia-drivers/files/173.14.39-kernel-3.14.patch
new file mode 100644
index 00000000..47bb70bc
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/173.14.39-kernel-3.14.patch
@@ -0,0 +1,12 @@
+--- a/usr/src/nv/nv-linux.h
++++ b/usr/src/nv/nv-linux.h
+@@ -206,8 +206,7 @@ extern int nv_pat_mode;
+ #endif
+
+ #if defined(CONFIG_ACPI)
+-#include <acpi/acpi.h>
+-#include <acpi/acpi_drivers.h>
++#include <linux/acpi.h>
+ #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
+ #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
+ #endif
diff --git a/x11-drivers/nvidia-drivers/files/173.14.39-kernel-3.17.patch b/x11-drivers/nvidia-drivers/files/173.14.39-kernel-3.17.patch
new file mode 100644
index 00000000..7b27d646
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/173.14.39-kernel-3.17.patch
@@ -0,0 +1,56 @@
+--- 1/work/usr/src/nv/conftest.sh
++++ 1/work/usr/src/nv/conftest.sh
+@@ -651,7 +651,7 @@
+ # a match() member.
+ #
+ echo "$CONFTEST_PREAMBLE
+- #include <acpi/acpi_bus.h>
++ #include <linux/acpi.h>
+ int conftest_acpi_device_ops(void) {
+ return offsetof(struct acpi_device_ops, match);
+ }" > conftest$$.c
+@@ -893,7 +893,7 @@
+ #
+
+ echo "$CONFTEST_PREAMBLE
+- #include <acpi/acpi_bus.h>
++ #include <linux/acpi.h>
+ acpi_status acpi_evaluate_integer(acpi_handle h, acpi_string s,
+ struct acpi_object_list *l, unsigned long long *d) {
+ return AE_OK;
+@@ -910,7 +910,7 @@
+ fi
+
+ echo "$CONFTEST_PREAMBLE
+- #include <acpi/acpi_bus.h>
++ #include <linux/acpi.h>
+ acpi_status acpi_evaluate_integer(acpi_handle h, acpi_string s,
+ struct acpi_object_list *l, unsigned long *d) {
+ return AE_OK;
+@@ -958,7 +958,7 @@
+ fi
+
+ echo "$CONFTEST_PREAMBLE
+- #include <acpi/acpi.h>
++ #include <linux/acpi.h>
+ void conftest_acpi_walk_namespace(void) {
+ acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL, NULL);
+ }" > conftest$$.c
+@@ -974,7 +974,7 @@
+ fi
+
+ echo "$CONFTEST_PREAMBLE
+- #include <acpi/acpi.h>
++ #include <linux/acpi.h>
+ void conftest_acpi_walk_namespace(void) {
+ acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL);
+ }" > conftest$$.c
+@@ -1043,7 +1043,7 @@
+ echo "#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT 0" >> conftest.h
+ return
+ else
+- echo "#error acpi_os_wait_events_complete() conftest failed!" >> conftest.h
++ : echo "#error acpi_os_wait_events_complete() conftest failed!" >> conftest.h
+ fi
+ ;;
+
diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch
new file mode 100644
index 00000000..da9933f6
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch
@@ -0,0 +1,11 @@
+diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h
+--- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h 2002-12-09 21:26:55.000000000 +0100
++++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h 2003-01-30 18:20:23.000000000 +0100
+@@ -39,6 +39,7 @@
+ typedef XID GLXPixmap;
+ typedef XID GLXDrawable;
+ typedef XID GLXPbuffer;
++typedef XID GLXPbufferSGIX;
+ typedef XID GLXWindow;
+ typedef XID GLXFBConfigID;
+
diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch
new file mode 100644
index 00000000..e0393e1b
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch
@@ -0,0 +1,13 @@
+--- usr/include/GL/gl.g.orig 2004-07-17 19:56:59.789410584 +1000
++++ usr/include/GL/gl.h 2004-07-17 19:59:08.844791184 +1000
+@@ -66,6 +66,10 @@
+ typedef double GLclampd;
+ typedef void GLvoid;
+
++/* Patching for some better defines in the global system */
++#ifndef GL_GLEXT_LEGACY
++#include <GL/glext.h>
++#endif
+
+ /*************************************************************/
+
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/x11-drivers/nvidia-drivers/files/nvidia-169.07
new file mode 100644
index 00000000..a96b0cd1
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-169.07
@@ -0,0 +1,14 @@
+# Nvidia drivers support
+alias char-major-195 nvidia
+alias /dev/nvidiactl char-major-195
+
+# To tweak the driver the following options can be used, note that
+# you should be careful, as it could cause instability!! For more
+# options see /usr/share/doc/PACKAGE/README
+#
+# !!! SECURITY WARNING !!!
+# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW
+# WHAT YOU ARE DOING.
+# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH,
+# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE.
+options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
new file mode 100644
index 00000000..d8e29e81
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>jer@gentoo.org</email>
+</maintainer>
+<use>
+ <flag name='kernel3-13'>Install unofficial patches for linux-3.13 and newer</flag>
+ <flag name='kernel3-14'>Install unofficial patches for linux-3.14 and newer</flag>
+ <flag name='kernel3-17'>Install unofficial patches for linux-3.17 and newer</flag>
+ <flag name='pax_kernel'>Patch to compile with hardened-sources/grsecurity</flag>
+ <flag name='tools'>Install additional tools such as nvidia-settings</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild
new file mode 100644
index 00000000..c452bbfe
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.39-r1.ebuild
@@ -0,0 +1,568 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-mod multilib nvidia-driver portability \
+ unpacker user versionator
+
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}-pkg0.run )
+ amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}-pkg2.run )
+ x86-fbsd? ( http://us.download.nvidia.com/freebsd/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
+
+LICENSE="GPL-2 NVIDIA-r1"
+SLOT="0"
+KEYWORDS="-* amd64 x86 ~x86-fbsd"
+IUSE="acpi multilib kernel3-13 kernel3-14 +kernel3-17 kernel_linux pax_kernel tools"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+COMMON="
+ >=app-admin/eselect-opengl-1.0.9
+ kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+"
+DEPEND="
+ ${COMMON}
+ !<dev-util/ccache-3.2
+ kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+ ${COMMON}
+ <x11-base/xorg-server-1.15.99
+ acpi? ( sys-power/acpid )
+ multilib? (
+ || (
+ (
+ >=x11-libs/libX11-1.6.2[abi_x86_32]
+ >=x11-libs/libXext-1.3.2[abi_x86_32]
+ )
+ app-emulation/emul-linux-x86-opengl
+ )
+ )
+ tools? (
+ dev-libs/atk
+ dev-libs/glib
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/pango[X]
+ )
+"
+
+QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+ usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
+ usr/lib/xorg/modules/drivers/nvidia_drv.so
+ usr/lib/libcuda.so.${PV}
+ usr/lib/libnvidia-cfg.so.${PV}
+ usr/lib/libvdpau_nvidia.so.${PV}
+ usr/lib/libXvMCNVIDIA.so.${PV}"
+
+QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
+ usr/lib/opengl/nvidia/lib/libGL.so.1
+ usr/lib/opengl/nvidia/lib/libGLcore.so.1
+ usr/lib/libnvidia-cfg.so.1
+ usr/lib/opengl/nvidia/extensions/libglx.so.1
+ usr/lib/xorg/modules/drivers/nvidia_drv.so"
+
+QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+ usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib32/libcuda.so.${PV}
+ usr/lib32/libvdpau_nvidia.so.${PV}"
+
+QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
+ usr/lib/xorg/modules/drivers/nvidia_drv.so
+ usr/lib/libXvMCNVIDIA.a:NVXVMC.o"
+
+QA_EXECSTACK_amd64="usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib64/libnvcompiler.so.${PV}
+ usr/lib64/libXvMCNVIDIA.so.${PV}
+ usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
+ usr/lib64/libnvidia-cfg.so.${PV}
+ usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+ usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
+ usr/lib64/xorg/modules/drivers/nvidia_drv.so
+ opt/bin/nvidia-settings
+ opt/bin/nvidia-smi
+ opt/bin/nvidia-xconfig"
+
+QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
+ usr/lib/libXvMCNVIDIA.a"
+
+QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}"
+
+QA_SONAME_amd64="usr/lib64/libnvcompiler.so.${PV}"
+
+QA_FLAGS_IGNORED_amd64="usr/lib32/libcuda.so.${PV}
+ usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+ usr/lib32/libvdpau_nvidia.so.${PV}
+ usr/lib64/libXvMCNVIDIA.so.${PV}
+ usr/lib64/libcuda.so.${PV}
+ usr/lib64/libnvidia-cfg.so.${PV}
+ usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+ usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
+ usr/lib64/xorg/modules/drivers/nvidia_drv.so
+ usr/lib64/libvdpau_nvidia.so.${PV}
+ opt/bin/nvidia-settings
+ opt/bin/nvidia-smi
+ opt/bin/nvidia-xconfig"
+
+QA_FLAGS_IGNORED_x86="usr/lib/libcuda.so.${PV}
+ usr/lib/libnvidia-cfg.so.${PV}
+ usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
+ usr/lib/opengl/nvidia/lib/libGL.so.${PV}
+ usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
+ usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
+ usr/lib/xorg/modules/drivers/nvidia_drv.so
+ usr/lib/libXvMCNVIDIA.so.${PV}
+ usr/lib/libvdpau_nvidia.so.${PV}
+ opt/bin/nvidia-settings
+ opt/bin/nvidia-smi
+ opt/bin/nvidia-xconfig"
+
+S="${WORKDIR}/"
+
+mtrr_check() {
+ ebegin "Checking for MTRR support"
+ linux_chkconfig_present MTRR
+ eend $?
+
+ if [[ $? -ne 0 ]] ; then
+ eerror "Please enable MTRR support in your kernel config, found at:"
+ eerror
+ eerror " Processor type and features"
+ eerror " [*] MTRR (Memory Type Range Register) support"
+ eerror
+ eerror "and recompile your kernel ..."
+ die "MTRR support not detected!"
+ fi
+}
+
+lockdep_check() {
+ if linux_chkconfig_present LOCKDEP; then
+ eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
+ eerror "Unfortunately, this option exports the symbol 'lockdep_init_map' as GPL-only"
+ eerror "which will prevent ${P} from compiling."
+ eerror "Please make sure the following options have been unset:"
+ eerror " Kernel hacking --->"
+ eerror " [ ] Lock debugging: detect incorrect freeing of live locks"
+ eerror " [ ] Lock debugging: prove locking correctness"
+ eerror " [ ] Lock usage statistics"
+ eerror "in 'menuconfig'"
+ die "LOCKDEP enabled"
+ fi
+}
+
+pkg_setup() {
+ # try to turn off distcc and ccache for people that have a problem with it
+ export DISTCC_DISABLE=1
+ export CCACHE_DISABLE=1
+
+ if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
+ eerror "This ebuild doesn't currently support changing your default abi."
+ die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+ fi
+
+ if use kernel_linux; then
+ linux-mod_pkg_setup
+ MODULE_NAMES="nvidia(video:${S}/usr/src/nv)"
+ BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+ SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
+ # linux-mod_src_compile calls set_arch_to_kernel, which
+ # sets the ARCH to x86 but NVIDIA's wrapping Makefile
+ # expects x86_64 or i386 and then converts it to x86
+ # later on in the build process
+ BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+ mtrr_check
+ lockdep_check
+ fi
+
+ # On BSD userland it wants real make command
+ use userland_BSD && MAKE="$(get_bmake)"
+
+ export _POSIX2_VERSION="199209"
+
+ if use kernel_linux && kernel_is ge 3 13 ; then
+ ewarn "No official support of nvidia or gentoo is available for >=linux-3.13"
+ ewarn "Please do not report any bug to nvidia or gentoo about it."
+ fi
+
+ # Since Nvidia ships 3 different series of drivers, we need to give the user
+ # some kind of guidance as to what version they should install. This tries
+ # to point the user in the right direction but can't be perfect. check
+ # nvidia-driver.eclass
+ nvidia-driver-check-warning
+
+ # set variables to where files are in the package structure
+ if use kernel_FreeBSD; then
+ use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+ NV_DOC="${S}/doc"
+ NV_EXEC="${S}/obj"
+ NV_LIB="${S}/obj"
+ NV_SRC="${S}/src"
+ NV_MAN="${S}/x11/man"
+ NV_X11="${S}/obj"
+ NV_X11_DRV="${NV_X11}"
+ NV_X11_EXT="${NV_X11}"
+ NV_SOVER=1
+ elif use kernel_linux; then
+ NV_DOC="${S}/usr/share/doc"
+ NV_EXEC="${S}/usr/bin"
+ NV_LIB="${S}/usr/lib"
+ NV_SRC="${S}/usr/src/nv"
+ NV_MAN="${S}/usr/share/man/man1"
+ NV_X11="${S}/usr/X11R6/lib"
+ NV_X11_DRV="${NV_X11}/modules/drivers"
+ NV_X11_EXT="${NV_X11}/modules/extensions"
+ NV_SOVER=${PV}
+ else
+ die "Could not determine proper NVIDIA package"
+ fi
+}
+
+src_unpack() {
+ if use kernel_linux && kernel_is lt 2 6 7; then
+ echo
+ ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+ ewarn "This is not officially supported for ${P}. It is likely you"
+ ewarn "will not be able to compile or use the kernel module."
+ ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
+ echo
+ ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
+ fi
+
+ if ! use x86-fbsd; then
+ mkdir "${S}"
+ cd "${S}"
+ unpack_makeself
+ else
+ unpack ${A}
+ fi
+}
+
+src_prepare() {
+ # Please add a brief description for every added patch
+ use x86-fbsd && cd doc
+
+ # Use the correct defines to make gtkglext build work
+ epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
+ # Use some more sensible gl headers and make way for new glext.h
+ epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
+
+ if use kernel_linux; then
+ # Quiet down warnings the user does not need to see
+ sed -i \
+ -e 's:-Wpointer-arith::g' \
+ -e 's:-Wsign-compare::g' \
+ "${NV_SRC}"/Makefile.kbuild
+
+ # If greater than 2.6.5 use M= instead of SUBDIR=
+ convert_to_m "${NV_SRC}"/Makefile.kbuild
+ fi
+
+ if use pax_kernel ; then
+ einfo "Enabling unofficial patches for hardened-sources/grsecurity"
+ epatch "${FILESDIR}/${PV}-grsecurity.patch"
+ fi
+
+ if use kernel3-17 ; then
+ einfo "Enabling unofficial patches for linux-3.17 and newer"
+ elif use kernel3-14 ; then
+ einfo "Enabling unofficial patches for linux-3.14 and newer"
+ elif use kernel3-13 ; then
+ einfo "Enabling unofficial patches for linux-3.13 and newer"
+ fi
+ if use kernel3-17 || use kernel3-14 || use kernel3-13 ; then
+ epatch "${FILESDIR}/${PV}-kernel-3.13.patch"
+ if use kernel3-17 || use kernel3-14 ; then
+ epatch "${FILESDIR}/${PV}-kernel-3.14.patch"
+ if use kernel3-17 ; then
+ epatch "${FILESDIR}/${PV}-kernel-3.17.patch"
+ fi
+ fi
+ fi
+
+ epatch_user
+}
+
+src_compile() {
+ # This is already the default on Linux, as there's no toplevel Makefile, but
+ # on FreeBSD there's one and triggers the kernel module build, as we install
+ # it by itself, pass this.
+
+ cd "${NV_SRC}"
+ if use x86-fbsd; then
+ MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)"
+ elif use kernel_linux; then
+ linux-mod_src_compile
+ fi
+}
+
+src_install() {
+ if use kernel_linux; then
+ linux-mod_src_install
+
+ # Add the aliases
+ # This file is tweaked with the appropriate video group in
+ # pkg_preinst, see bug #491414
+ insinto /etc/modprobe.d
+ newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+ elif use kernel_FreeBSD; then
+ insinto /boot/modules
+ doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld"
+
+ exeinto /boot/modules
+ doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko"
+ fi
+
+ # NVIDIA kernel <-> userspace driver config lib
+ dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \
+ die "failed to install libnvidia-cfg"
+ dosym libnvidia-cfg.so.${NV_SOVER} \
+ /usr/$(get_libdir)/libnvidia-cfg.so.1 || \
+ die "failed to create libnvidia-cfg.so.1 symlink"
+ dosym libnvidia-cfg.so.1 \
+ /usr/$(get_libdir)/libnvidia-cfg.so || \
+ die "failed to create libnvidia-cfg.so symlink"
+
+ # Xorg DDX driver
+ insinto /usr/$(get_libdir)/xorg/modules/drivers
+ doins ${NV_X11_DRV}/nvidia_drv.so
+
+ # Xorg GLX driver
+ insinto /usr/$(get_libdir)/opengl/nvidia/extensions
+ doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \
+ die "failed to install libglx.so"
+ dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \
+ /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \
+ die "failed to create libglx.so symlink"
+
+ # XvMC driver
+ dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
+ die "failed to install libXvMCNVIDIA.so"
+ dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \
+ die "failed to install libXvMCNVIDIA.so"
+ dosym libXvMCNVIDIA.so.${NV_SOVER} \
+ /usr/$(get_libdir)/libXvMCNVIDIA.so.1 || \
+ die "failed to create libXvMCNVIDIA.so.1 symlink"
+ dosym libXvMCNVIDIA.so.1 \
+ /usr/$(get_libdir)/libXvMCNVIDIA.so || \
+ die "failed to create libXvMCNVIDIA.so symlink"
+ dosym libXvMCNVIDIA.so.${NV_SOVER} \
+ /usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
+ die "failed to create libXvMCNVIDIA_dynamic.so.1 symlink"
+
+ # CUDA headers (driver to come)
+ if use kernel_linux && [[ -d ${S}/usr/include/cuda ]]; then
+ dodir /usr/include/cuda
+ insinto /usr/include/cuda
+ doins usr/include/cuda/*.h
+ fi
+
+ # OpenCL headers (driver to come)
+ if [[ -d ${S}/usr/include/CL ]]; then
+ dodir /usr/include/CL
+ insinto /usr/include/CL
+ doins usr/include/CL/*.h
+ fi
+
+ # Documentation
+ dodoc ${NV_DOC}/XF86Config.sample
+ dohtml ${NV_DOC}/html/*
+ if use x86-fbsd; then
+ dodoc "${NV_DOC}/README"
+ doman "${NV_MAN}/nvidia-xconfig.1"
+ doman "${NV_MAN}/nvidia-settings.1"
+ else
+ # Docs
+ newdoc "${NV_DOC}/README.txt" README
+ dodoc "${NV_DOC}/NVIDIA_Changelog"
+ doman "${NV_MAN}/nvidia-xconfig.1.gz"
+ doman "${NV_MAN}/nvidia-settings.1.gz"
+ fi
+
+ # Helper Apps
+ exeinto /opt/bin/
+ doexe ${NV_EXEC}/nvidia-xconfig
+ doexe ${NV_EXEC}/nvidia-bug-report.sh
+ if use tools; then
+ doexe usr/bin/nvidia-settings
+ fi
+ if use kernel_linux; then
+ doexe ${NV_EXEC}/nvidia-smi
+ fi
+
+ # Desktop entry for nvidia-settings
+ if use tools && use kernel_linux; then
+ sed -e 's:__UTILS_PATH__:/opt/bin:' \
+ -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \
+ -e '/^Categories/s|Application;||g' \
+ -i "${S}"/usr/share/applications//nvidia-settings.desktop
+ newmenu "${S}"/usr/share/applications/nvidia-settings.desktop \
+ nvidia-settings-opt.desktop
+ fi
+
+ if has_multilib_profile ; then
+ local OABI=${ABI}
+ for ABI in $(get_install_abis) ; do
+ src_install-libs
+ done
+ ABI=${OABI}
+ unset OABI
+ else
+ src_install-libs
+ fi
+
+ find "${ED}" -name "*.a" -exec rm -f "{}" + || die ".a file removal failed"
+
+ is_final_abi || die "failed to iterate through all ABIs"
+
+ readme.gentoo_create_doc
+}
+
+# Install nvidia library:
+# the first parameter is the place where to install it
+# the second parameter is the base name of the library
+# the third parameter is the provided soversion
+donvidia() {
+ dodir $1
+ exeinto $1
+
+ libname=$(basename $2)
+
+ doexe $2.$3
+ dosym ${libname}.$3 $1/${libname}
+ [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
+}
+
+src_install-libs() {
+ local inslibdir=$(get_libdir)
+ local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+ local libdir= sover=
+
+ if use kernel_linux; then
+ if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
+ libdir=usr/lib32
+ else
+ libdir=usr/lib
+ fi
+ sover=${PV}
+ else
+ libdir=obj
+ # on FreeBSD it has just .1 suffix
+ sover=1
+ fi
+
+ # The GLX libraries
+ donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover}
+ donvidia ${NV_ROOT}/lib ${libdir}/libGLcore.so ${sover}
+ if use x86-fbsd; then
+ donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover}
+ else
+ donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}
+ fi
+
+ #cuda
+ if [[ -f ${libdir}/libcuda.so.${sover} ]]; then
+ dolib.so ${libdir}/libcuda.so.${sover}
+ [[ "${sover}" != "1" ]] && dosym libcuda.so.${sover} /usr/${inslibdir}/libcuda.so.1
+ dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so
+ fi
+
+ #vdpau
+ if [[ -f ${libdir}/libvdpau_nvidia.so.${sover} ]]; then
+ dolib.so ${libdir}/libvdpau_nvidia.so.${sover}
+ dosym libvdpau_nvidia.so.${sover} /usr/${inslibdir}/libvdpau_nvidia.so
+ fi
+
+ # OpenCL
+ # NOTE: This isn't currently available in the publicly released drivers.
+ if [[ -f ${libdir}/libOpenCL.so.1.0.0 ]]; then
+
+ dolib.so ${libdir}/libnvcompiler.so.${sover}
+ [[ "${sover}" != "1" ]] && dosym libnvcompiler.so.${sover} /usr/${inslibdir}/libnvcompiler.so.1
+ dosym libnvcompiler.so.1 /usr/${inslibdir}/libnvcompiler.so
+
+ dolib.so ${libdir}/libOpenCL.so.1.0.0
+ dosym libOpenCL.so.1.0.0 /usr/${inslibdir}/libOpenCL.so.1
+ dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so
+ fi
+}
+
+pkg_preinst() {
+ if use kernel_linux; then
+ linux-mod_pkg_preinst
+
+ local videogroup="$(egetent group video | cut -d ':' -f 3)"
+ if [ -z "${videogroup}" ]; then
+ eerror "Failed to determine the video group gid"
+ die "Failed to determine the video group gid"
+ else
+ sed -i \
+ -e "s:PACKAGE:${PF}:g" \
+ -e "s:VIDEOGID:${videogroup}:" \
+ "${D}"/etc/modprobe.d/nvidia.conf || die
+ fi
+ fi
+
+ # Clean the dynamic libGL stuff's home to ensure
+ # we dont have stale libs floating around
+ if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+ rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+ fi
+ # Make sure we nuke the old nvidia-glx's env.d file
+ if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+ rm -f "${ROOT}"/etc/env.d/09nvidia
+ fi
+}
+
+pkg_postinst() {
+ use kernel_linux && linux-mod_pkg_postinst
+
+ # Switch to the nvidia implementation
+ "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+
+ readme.gentoo_print_elog
+
+ if ! use tools; then
+ elog "USE=tools controls whether the nvidia-settings application"
+ elog "is installed. If you would like to use it, enable that"
+ elog "flag and re-emerge this ebuild. Optionally you can install"
+ elog "media-video/nvidia-settings"
+ fi
+}
+
+pkg_prerm() {
+ "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+ use kernel_linux && linux-mod_pkg_postrm
+ "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
deleted file mode 100644
index 72395927..00000000
--- a/x11-libs/gtk+/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gtk+-2.24.33.tar.xz 12661828 SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
-DIST gtk+-3.24.29.tar.xz 21396876 SHA512 00f71024686c2d11d5c0cdd683365c35fe4d28b5eaad4937e79690777500788818faa5bd0c483e54ba8ce734aa6411388a39e398dc638cfcf0ec0e542aae6c2b
diff --git a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
deleted file mode 100644
index 451233ca..00000000
--- a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9e0f33144aff8d792ab105927cf686eda0afd25e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 18 May 2014 10:50:05 +0200
-Subject: [PATCH] aliasfilecheck: check for sources both in builddir & srcdir.
-
-The $gtk_all_c_sources variable contains both supplied and generated
-sources. The former reside in $srcdir, the latter in the build directory
-(cwd).
-
-In order to handle both kinds properly, first try to find each source
-file in cwd, and then fallback to $srcdir. This makes it possible to use
-out-of-source builds, and guarantees that fresh-built source files will
-be used rather than pre-generated copies included in the distribution
-tarball.
----
- gtk/aliasfilescheck.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh
-index 31b49d4..3636a82 100755
---- a/gtk/aliasfilescheck.sh
-+++ b/gtk/aliasfilescheck.sh
-@@ -6,6 +6,6 @@ if test "x$gtk_all_c_sources" = x; then
- fi
-
- grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files
--{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files
-+{ for f in $gtk_all_c_sources; do if test -f ${f}; then grep '^ *# *define __' ${f}; else grep '^ *# *define __' "${srcdir-.}"/${f}; fi; done } | sed 's/.*define //;s/ *$//' | sort > actual-files
-
- diff expected-files actual-files && rm -f expected-files actual-files
---
-1.9.3
-
diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch b/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch
deleted file mode 100644
index 1d09721b..00000000
--- a/x11-libs/gtk+/files/gtk+-2.24.31-fix-gtkentry-beep.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From debba4d14155a9e5736de069c2b693ab6f6e21aa Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Wed, 5 Oct 2016 12:20:14 -0400
-Subject: [PATCH] entry: Fix a corner case of overwrite mode
-
-We currently beep when a character is appended at the end in
-overwrite mode. That is obviously not right. Patch based on
-a patch by Ian MacDonald.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=772389
----
- gtk/gtkentry.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
-index b522039..bc33754 100644
---- a/gtk/gtkentry.c
-+++ b/gtk/gtkentry.c
-@@ -5224,6 +5224,7 @@ gtk_entry_enter_text (GtkEntry *entry,
- GtkEditable *editable = GTK_EDITABLE (entry);
- gint tmp_pos;
- gboolean old_need_im_reset;
-+ guint text_length;
-
- old_need_im_reset = entry->need_im_reset;
- entry->need_im_reset = FALSE;
-@@ -5233,7 +5234,11 @@ gtk_entry_enter_text (GtkEntry *entry,
- else
- {
- if (entry->overwrite_mode)
-- gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1);
-+ {
-+ text_length = gtk_entry_buffer_get_length (get_buffer (entry));
-+ if (entry->current_pos < text_length)
-+ gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1);
-+ }
- }
-
- tmp_pos = entry->current_pos;
---
-2.10.0
-
diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch
deleted file mode 100644
index 11dbb5e4..00000000
--- a/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 260f94f3914ba18a256e6f1c222f643a57854e80 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 9 May 2015 23:30:58 +0200
-Subject: [PATCH] Always use external gtk-update-icon-cache
-
----
- configure.ac | 8 +++-----
- docs/reference/gtk/Makefile.am | 2 +-
- gtk/Makefile.am | 13 ++-----------
- 3 files changed, 6 insertions(+), 17 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4e11b40..7ef8cb6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -913,11 +913,9 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
-
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-
--if test $cross_compiling = yes; then
-- AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
-- if test x$GTK_UPDATE_ICON_CACHE = xno; then
-- REBUILD_PNGS=#
-- fi
-+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
-+if test x$GTK_UPDATE_ICON_CACHE = xno; then
-+ REBUILD_PNGS=#
- fi
-
- AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
-diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
-index c239445..60b5265 100644
---- a/docs/reference/gtk/Makefile.am
-+++ b/docs/reference/gtk/Makefile.am
-@@ -368,7 +368,7 @@ EXTRA_DIST += version.xml.in
-
- if ENABLE_MAN
-
--man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
-+man_MANS = gtk-query-immodules-2.0.1 gtk-builder-convert.1
-
- %.1 : %.xml
- @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 8cc4536..a7afbf3 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1087,8 +1087,7 @@ endif
- # Installed tools
- #
- bin_PROGRAMS = \
-- gtk-query-immodules-2.0 \
-- gtk-update-icon-cache
-+ gtk-query-immodules-2.0
-
- bin_SCRIPTS = gtk-builder-convert
-
-@@ -1438,16 +1437,8 @@ stamp-icons: $(STOCK_ICONS)
- ) done \
- && touch stamp-icons
-
--if CROSS_COMPILING
--gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
--else
--gtk_update_icon_cache_program = \
-- ./gtk-update-icon-cache
--endif
--
- gtkbuiltincache.h: @REBUILD@ stamp-icons
-- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
-- $(gtk_update_icon_cache_program) --force --ignore-theme-index \
-+ $(GTK_UPDATE_ICON_CACHE) --force --ignore-theme-index \
- --include-image-data \
- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
- mv gtkbuiltincache.h.tmp gtkbuiltincache.h
---
-2.10.0
-
diff --git a/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch b/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch
deleted file mode 100644
index 0c74d962..00000000
--- a/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/725852
---- a/configure.ac
-+++ b/configure.ac
-@@ -190,7 +190,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
- AC_SYS_LARGEFILE
-
- AM_PROG_AS
--AC_PATH_TOOL(NM, nm, nm)
-+AC_CHECK_TOOL(NM, nm, nm)
-
- dnl Initialize maintainer mode
- AM_MAINTAINER_MODE([enable])
diff --git a/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch b/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch
deleted file mode 100644
index 8913bc88..00000000
--- a/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 4588c9c6463d8958d8305caafa58ea5c263fd352 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 16 Jan 2018 09:07:38 +0100
-Subject: [PATCH] Fix libcloudproviders check
-
-Use autotools managed variables and make use of pkgconfig macros.
----
- configure.ac | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 24110386b4..cebe66c2e5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -349,8 +349,10 @@ AC_ARG_ENABLE(mir-backend,
-
- AC_ARG_ENABLE(cloudproviders,
- [AS_HELP_STRING([--enable-cloudproviders],
-- [enable libcloudproviders integration])],
-- [cloudproviders_set=yes])
-+ [enable libcloudproviders integration])
-+ ],
-+ [],
-+ [enable_cloudproviders=yes])
-
- if test -z "$backend_set"; then
- if test "$platform_win32" = yes; then
-@@ -1350,17 +1352,15 @@ fi
- # Check for libcloudproviders
-
- CLOUDPROVIDER_PACKAGES=""
--if test "x$cloudproviders_set" = "xyes"; then
-- CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version"
-- if $PKG_CONFIG --exists $CLOUDPROVIDER_PACKAGES ; then
-- AC_DEFINE(HAVE_CLOUDPROVIDERS, [1],
-- [Define if libcloudproviders is available]
-- )
-- else
-- AC_MSG_ERROR([
--*** libcloudproviders not found.])
-- fi
--fi
-+AS_IF([test "$enable_cloudproviders" = "yes"],
-+ [
-+ CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version"
-+ PKG_CHECK_EXISTS(
-+ [$CLOUDPROVIDER_PACKAGES],
-+ [AC_DEFINE(HAVE_CLOUDPROVIDERS, [1], [Define if libcloudproviders is available])],
-+ [AC_MSG_ERROR([*** libcloudproviders not found])]
-+ )
-+ ])
-
- CFLAGS="$saved_cflags"
- LDFLAGS="$saved_ldflags"
---
-2.15.1
-
diff --git a/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch
deleted file mode 100644
index a648ba40..00000000
--- a/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From ce23725d2b25b61a4eec8db0899d49d5a9dbcc6d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 1 Nov 2016 15:24:22 +0100
-Subject: [PATCH] Always use external gtk-update-icon-cache
-
-Check for gtk-update-icon-cache to install demos, otherwise it is not
-used when building.
----
- configure.ac | 2 ++
- demos/gtk-demo/Makefile.am | 2 +-
- demos/widget-factory/Makefile.am | 2 +-
- docs/reference/gtk/Makefile.am | 1 -
- gtk/Makefile.am | 27 ---------------------------
- 5 files changed, 4 insertions(+), 30 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 36dda2ebaf..df9d9b0e9b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -974,6 +974,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
-
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-
-+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, [gtk-update-icon-cache], [no])
-+
- ########################################
- # Windowing system checks
- ########################################
-diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
-index 4a2f827469..369ba5d3cc 100644
---- a/demos/gtk-demo/Makefile.am
-+++ b/demos/gtk-demo/Makefile.am
-@@ -174,7 +174,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
- dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
- dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
-
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
-
- install-data-hook: install-update-icon-cache
- uninstall-hook: uninstall-update-icon-cache
-diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
-index c33a6d0a95..291f389f53 100644
---- a/demos/widget-factory/Makefile.am
-+++ b/demos/widget-factory/Makefile.am
-@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget
- dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
- dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
-
--update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
-
- install-data-hook: install-update-icon-cache
- uninstall-hook: uninstall-update-icon-cache
-diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
-index dc9b80c6c5..bcaa4032c9 100644
---- a/docs/reference/gtk/Makefile.am
-+++ b/docs/reference/gtk/Makefile.am
-@@ -502,7 +502,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in getting_started.xml.in
-
- man_MANS = \
- gtk-query-immodules-3.0.1 \
-- gtk-update-icon-cache.1 \
- gtk-encode-symbolic-svg.1 \
- gtk-launch.1 \
- gtk3-demo.1 \
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 9608ab3355..74792a4b40 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1658,7 +1658,6 @@ endif
- #
- bin_PROGRAMS = \
- gtk-query-immodules-3.0 \
-- gtk-update-icon-cache \
- gtk-encode-symbolic-svg \
- gtk-builder-tool \
- gtk-query-settings \
-@@ -1671,9 +1670,6 @@ gtk_query_immodules_3_0_LDADD = \
- $(GMODULE_LIBS) \
- $(GTK_DEP_LIBS)
-
--gtk_update_icon_cache_SOURCES = updateiconcache.c
--gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
--
- gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
- gtk_encode_symbolic_svg_LDADD = \
- $(GDK_PIXBUF_LIBS) \
-@@ -1698,29 +1694,6 @@ gtk_launch_LDADD = \
- $(top_builddir)/gdk/libgdk-3.la \
- $(GTK_DEP_LIBS)
-
--if OS_WIN32
--
--# Workaround for UAC silliness: programs with "update" in their name
--# are believed to be installers and require elevated privileges to be
--# used... Embed a manifest file into executable to tell Windows that
--# gtk-update-icon-cache.exe doesn't require any special privileges.
--
--GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
--GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
--GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o
--
--$(GTK_UPDATE_ICON_CACHE_MANIFEST): Makefile generate-uac-manifest.py
-- $(PYTHON) $(srcdir)/generate-uac-manifest.py -p=gtk3 -n=gtk-update-icon-cache --pkg-version=$(GTK_VERSION) --output-dir=$(builddir)
--
--$(GTK_UPDATE_ICON_CACHE_RC): $(GTK_UPDATE_ICON_CACHE_MANIFEST)
--
--$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
-- $(WINDRES) --input $< --output $@ --output-format=coff
--
--gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
--
--endif
--
- .PHONY: files
-
- files:
---
-2.30.0
-
diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch
deleted file mode 100644
index 8388a744..00000000
--- a/x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.2 2014/09/08 12:06:48 wiz Exp $
-
-Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
-
---- 1/configure.ac
-+++ 2/configure.ac
-@@ -1295,8 +1295,13 @@ AC_SUBST(GDK_DEP_CFLAGS)
- # Check for Accessibility Toolkit flags
- ########################################
-
--if test x$enable_x11_backend = xyes; then
-+AC_ARG_WITH(atk-bridge,
-+ AS_HELP_STRING([--without-atk-bridge], [Do not use atk-bridge-2.0]),
-+ :, with_atk_bridge=yes)
-+
-+if test x$enable_x11_backend = xyes -a x$with_atk_bridge = xyes; then
- ATK_PACKAGES="atk atk-bridge-2.0"
-+ AC_DEFINE([HAVE_ATK_BRIDGE], [1], [Define if we're using atk-bridge-2.0])
- else
- ATK_PACKAGES="atk"
- fi
diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch
deleted file mode 100644
index 6dee2e42..00000000
--- a/x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-config.h.in,v 1.2 2014/09/08 12:06:48 wiz Exp $
-
-Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
-
---- 1/config.h.in
-+++ 1/config.h.in
-@@ -21,6 +21,9 @@
- /* Define the location where the catalogs will be installed */
- #undef GTK_LOCALEDIR
-
-+/* Define if we're using atk-bridge-2.0 */
-+#undef HAVE_ATK_BRIDGE
-+
- /* Define to 1 if you have the `bind_textdomain_codeset' function. */
- #undef HAVE_BIND_TEXTDOMAIN_CODESET
-
diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch
deleted file mode 100644
index 276d2d16..00000000
--- a/x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
---- 1/gtk/a11y/gtkaccessibility.c
-+++ 1/gtk/a11y/gtkaccessibility.c
-@@ -38,8 +38,10 @@
- #include <gtk/gtkaccessible.h>
-
- #ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_ATK_BRIDGE
- #include <atk-bridge.h>
- #endif
-+#endif
-
- static gboolean gail_focus_watcher (GSignalInvocationHint *ihint,
- guint n_param_values,
-@@ -983,8 +985,10 @@ _gtk_accessibility_init (void)
- do_window_event_initialization ();
-
- #ifdef GDK_WINDOWING_X11
-+#ifdef HAVE_ATK_BRIDGE
- atk_bridge_adaptor_init (NULL, NULL);
- #endif
-+#endif
-
- atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
- }
diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini
deleted file mode 100644
index a65c0a81..00000000
--- a/x11-libs/gtk+/files/settings.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[Settings]
-gtk-theme-name = Adwaita
-gtk-icon-theme-name = gnome
-gtk-cursor-theme-name = Adwaita
diff --git a/x11-libs/gtk+/gtk+-2.24.33.ebuild b/x11-libs/gtk+/gtk+-2.24.33.ebuild
deleted file mode 100644
index a170012c..00000000
--- a/x11-libs/gtk+/gtk+-2.24.33.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF="yes"
-
-inherit flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-SRC_URI=${SRC_URI}
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="adwaita-icon-theme aqua cups doc examples +introspection test vim-syntax xinerama"
-REQUIRED_USE="
- xinerama? ( !aqua )
-"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
-RESTRICT="test"
-
-COMMON_DEPEND="
- >=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- virtual/libintl[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
- >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
- x11-misc/shared-mime-info
-
- cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
- !aqua? (
- >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
- >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
- )
-"
-DEPEND="${COMMON_DEPEND}
- !aqua? ( x11-base/xorg-proto )
- test? (
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- x11-themes/hicolor-icon-theme
- )
-"
-
-# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
-# Add blocker against old gtk-builder-convert to be sure we maintain both
-# in sync.
-RDEPEND="${COMMON_DEPEND}
- >=dev-util/gtk-update-icon-cache-2
- adwaita-icon-theme? (
- >=x11-themes/adwaita-icon-theme-3.14
- x11-themes/gnome-themes-standard
- )
- !<dev-util/gtk-builder-convert-${PV}
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
- adwaita-icon-theme? (
- gnome-base/librsvg[${MULTILIB_USEDEP}]
- x11-themes/gtk-engines-adwaita
- )
- vim-syntax? ( app-vim/gtk-syntax )
-"
-# docbook-4.1.2 and xsl required for man pages
-# docbook-4.3 required for gtk-doc
-BDEPEND="
- doc? (
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xml-dtd:4.3
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- )
- dev-libs/gobject-introspection-common
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.20
- >=sys-devel/gettext-0.18.3
- virtual/pkgconfig
- examples? ( x11-libs/gdk-pixbuf )
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
-edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
-[Filechooser Settings]
-StartupMode=cwd"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gtk-query-immodules-2.0$(get_exeext)
-)
-
-PATCHES=(
- # Fix tests running when building out of sources, bug #510596, upstream bug #730319
- "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
- # Rely on split gtk-update-icon-cache package, bug #528810
- "${FILESDIR}"/${PN}-2.24.31-update-icon-cache.patch # requires eautoreconf
- # Respect ${NM}, bug #725852
- "${FILESDIR}"/${PN}-2.24.33-respect-NM.patch # requires eautoreconf
-)
-
-strip_builddir() {
- local rule=$1
- shift
- local directory=$1
- shift
- sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
- || die "Could not strip director ${directory} from build."
-}
-
-set_gtk2_confdir() {
- # An arch specific config directory is used on multilib systems
- GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-}
-
-src_prepare() {
- # Various glib marshaller churn could break build against a different glib version, force regeneration
- rm -v gdk/gdkmarshalers.{c,h} gtk/gtkmarshal.{c,h} gtk/gtkmarshalers.{c,h} \
- perf/marshalers.{c,h} gtk/gtkaliasdef.c gtk/gtkalias.h || die
-
- # Stop trying to build unmaintained docs, bug #349754, upstream bug #623150
- strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
- strip_builddir SUBDIRS faq docs/Makefile.{am,in}
-
- # -O3 and company cause random crashes in applications, bug #133469
- replace-flags -O3 -O2
- strip-flags
-
- if ! use test ; then
- # don't waste time building tests
- strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
- strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
- else
- # Non-working test in gentoo's env
- sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
- -i gtk/tests/testing.c || die "sed 1 failed"
-
- # Cannot work because glib is too clever to find real user's home
- # gentoo bug #285687, upstream bug #639832
- # XXX: /!\ Pay extra attention to second sed when bumping /!\
- sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
- || die "failed to disable recentmanager test (1)"
- sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
- || die "failed to disable recentmanager test (2)"
- sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
- || die "failed to disable recentmanager test (3)"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=617473
- sed -i -e 's:pltcheck.sh:$(NULL):g' \
- gtk/Makefile.am || die
-
- # UI tests require immodules already installed; bug #413185
- if ! has_version 'x11-libs/gtk+:2'; then
- ewarn "Disabling UI tests because this is the first install of"
- ewarn "gtk+:2 on this machine. Please re-run the tests after ${P}"
- ewarn "has been installed."
- sed '/g_test_add_func.*ui-tests/ d' \
- -i gtk/tests/testing.c || die "sed 2 failed"
- fi
- fi
-
- if ! use examples; then
- # don't waste time building demos
- strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
- fi
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- [[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
-
- if use doc
- then set -- --enable-man --with-xml-catalog="${EPREFIX}"/etc/xml/catalog
- else set --
- fi
- ECONF_SOURCE=${S} \
- gnome2_src_configure \
- $(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
- $(usex aqua "" --with-xinput) \
- $(use_enable cups cups auto) \
- $(multilib_native_use_enable introspection) \
- $(use_enable xinerama) \
- --disable-papi \
- "$@" \
- CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-
- # work-around gtk-doc out-of-source brokedness
- if multilib_is_native_abi; then
- local d
- for d in gdk gtk libgail-util; do
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
- done
- fi
-}
-
-multilib_src_test() {
- virtx emake check
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-multilib_src_install_all() {
- # see bug #133241
- # Also set more default variables in sync with gtk3 and other distributions
- echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
- echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc"
- if use adwaita-icon-theme ; then
- echo 'gtk-icon-theme-name = "Adwaita"' >> "${T}/gtkrc"
- else
- echo 'gtk-icon-theme-name = "gnome"' >> "${T}/gtkrc"
- fi
- echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc"
-
- insinto /usr/share/gtk-2.0
- doins "${T}"/gtkrc
-
- einstalldocs
- rm "${ED}"/usr/share/doc/${P}/ChangeLog # empty file
-
- # dev-util/gtk-builder-convert split off into a separate package, #402905
- rm "${ED}"/usr/bin/gtk-builder-convert || die
- if use doc ; then
- rm "${ED}"/usr/share/man/man1/gtk-builder-convert.* || die
- fi
-
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
-
- multilib_pkg_preinst() {
- # Make immodules.cache belongs to gtk+ alone
- local cache="/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
-
- if [[ -e "${EROOT}${cache}" ]]; then
- cp "${EROOT}${cache}" "${ED}${cache}" || die
- else
- touch "${ED}${cache}" || die
- fi
- }
- multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- multilib_pkg_postinst() {
- gnome2_query_immodules_gtk2 \
- || die "Update immodules cache failed (for ${ABI})"
- }
- multilib_parallel_foreach_abi multilib_pkg_postinst
-
- set_gtk2_confdir
-
- if [ -e "${EROOT}/etc/gtk-2.0/gtk.immodules" ]; then
- elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
- elog "aware location. Removing deprecated file."
- rm -f "${EROOT}/etc/gtk-2.0/gtk.immodules"
- fi
-
- if [ -e "${EROOT}${GTK2_CONFDIR}/gtk.immodules" ]; then
- elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
- elog "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
- elog "Removing deprecated file."
- rm -f "${EROOT}${GTK2_CONFDIR}/gtk.immodules"
- fi
-
- # pixbufs are now handled by x11-libs/gdk-pixbuf
- if [ -e "${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
- elog "File ${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
- elog "Removing deprecated file."
- rm -f "${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
- fi
-
- # two checks needed since we dropped multilib conditional
- if [ -e "${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
- elog "File ${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
- elog "Removing deprecated file."
- rm -f "${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders"
- fi
-
- if [ -e "${EROOT}"/usr/lib/gtk-2.0/2.[^1]* ]; then
- elog "You need to rebuild ebuilds that installed into" "${EROOT}"/usr/lib/gtk-2.0/2.[^1]*
- elog "to do that you can use qfile from portage-utils:"
- elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
- fi
-
- if ! has_version "app-text/evince"; then
- elog "Please install app-text/evince for print preview functionality."
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
- elog "add it to your gtkrc."
- fi
-
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- if [[ -z ${REPLACED_BY_VERSION} ]]; then
- multilib_pkg_postrm() {
- rm -f "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
- }
- multilib_foreach_abi multilib_pkg_postrm
- fi
-}
diff --git a/x11-libs/gtk+/gtk+-3.24.29.ebuild b/x11-libs/gtk+/gtk+-3.24.29.ebuild
deleted file mode 100644
index f45a9c88..00000000
--- a/x11-libs/gtk+/gtk+-3.24.29.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 multilib multilib-minimal virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-SRC_URI=${SRC_URI-}
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="adwaita-icon-theme aqua atk-bridge broadway cloudprint colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
- || ( aqua wayland X )
- xinerama? ( X )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
- >=dev-libs/atk-2.32.0[introspection?,${MULTILIB_USEDEP}]
- >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
- media-libs/fontconfig[${MULTILIB_USEDEP}]
- >=media-libs/harfbuzz-0.9:=
- >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
- virtual/libintl[${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
- >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
- x11-misc/shared-mime-info
-
- cloudprint? (
- >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}]
- >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
- )
- colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
- cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.39:= )
- sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
- wayland? (
- >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
- >=dev-libs/wayland-protocols-1.17
- media-libs/mesa[wayland,${MULTILIB_USEDEP}]
- >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
- )
- X? (
- atk-bridge? ( >=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}] )
- media-libs/mesa[X(+),${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXcomposite[${MULTILIB_USEDEP}]
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXdamage[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
- >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- )
-"
-DEPEND="${COMMON_DEPEND}
- test? (
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- )
- X? ( x11-base/xorg-proto )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-RDEPEND="${COMMON_DEPEND}
- >=dev-util/gtk-update-icon-cache-3
- !<x11-libs/vte-0.31.0:2.90
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
- adwaita-icon-theme? ( gnome-base/librsvg[${MULTILIB_USEDEP}]
- >=x11-themes/adwaita-icon-theme-3.14 )
- !adwaita-icon-theme? ( x11-themes/hicolor-icon-theme virtual/freedesktop-icon-theme )
- vim-syntax? ( app-vim/gtk-syntax )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xsl-stylesheets
- dev-libs/gobject-introspection-common
- dev-libs/libxslt
- >=dev-util/gdbus-codegen-2.48
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.20
- wayland? ( dev-util/wayland-scanner )
- >=sys-devel/gettext-0.19.7
- virtual/pkgconfig
- x11-libs/gdk-pixbuf:2
- gtk-doc? (
- app-text/docbook-xml-dtd:4.3
- >=dev-util/gtk-doc-1.20
- )
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-PATCHES=(
- # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
- "${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch
-
- # Fix broken autotools logic
- "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-)
-
-strip_builddir() {
- local rule=$1
- shift
- local directory=$1
- shift
- sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
- || die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
- if ! use test ; then
- # don't waste time building tests
- strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
- # the tests dir needs to be build now because since commit
- # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
- # strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
- fi
-
- if ! use examples; then
- # don't waste time building demos
- strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
- strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
- fi
-
- # Use patches from BSD to make gtk3-atk-bridge a true option -
- # This was intentionally removed by upstream, see
- # https://mail.gnome.org/archives/commits-list/2012-June/msg03813.html
- eapply "${FILESDIR}"/${PN}-atk-bridge-config.ac.patch
- eapply "${FILESDIR}"/${PN}-atk-bridge-config.h.in.patch
- eapply "${FILESDIR}"/${PN}-atk-bridge-gtkaccessibility.patch
-
- eautoreconf
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=(
- $(use_enable aqua quartz-backend)
- $(use_enable broadway broadway-backend)
- $(use_enable cloudprint)
- $(use_enable colord)
- $(use_enable cups cups auto)
- $(multilib_native_use_enable gtk-doc)
- $(multilib_native_use_enable introspection)
- $(use_enable sysprof profiler)
- $(use_enable wayland wayland-backend)
- $(use_enable X x11-backend)
- $(use_enable X xcomposite)
- $(use_enable X xdamage)
- $(use_enable X xfixes)
- $(use_enable X xkb)
- $(use_enable X xrandr)
- $(use_enable xinerama)
- $(use_with atk-bridge)
- # cloudprovider is not packaged in Gentoo yet
- --disable-cloudproviders
- --disable-papi
- --enable-man
- --with-xml-catalog="${EPREFIX}"/etc/xml/catalog
- # need libdir here to avoid a double slash in a path that libtool doesn't
- # grok so well during install (// between $EPREFIX and usr ...)
- # TODO: Is this still the case?
- --libdir="${EPREFIX}"/usr/$(get_libdir)
- CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
- )
-
- if use wayland; then
- myconf+=(
- # Include wayland immodule into gtk itself, to avoid problems like
- # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
- # user overridden GTK_IM_MODULE envvar
- --with-included-immodules=wayland
- )
- fi;
-
- ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-
- # work-around gtk-doc out-of-source brokedness
- if multilib_is_native_abi; then
- local d
- for d in gdk gtk libgail-util; do
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
- done
- fi
-}
-
-multilib_src_test() {
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
- GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-multilib_src_install_all() {
- insinto /etc/gtk-3.0
- doins "${FILESDIR}"/settings.ini
- # Skip README.{in,commits,win32} that would get installed by default
- DOCS=( AUTHORS ChangeLog NEWS README )
- einstalldocs
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
-
- multilib_pkg_preinst() {
- # Make immodules.cache belongs to gtk+ alone
- local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}${cache}" "${ED}${cache}" || die
- else
- touch "${ED}${cache}" || die
- fi
- }
- multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- multilib_pkg_postinst() {
- gnome2_query_immodules_gtk3 \
- || die "Update immodules cache failed (for ${ABI})"
- }
- multilib_parallel_foreach_abi multilib_pkg_postinst
-
- if ! has_version "app-text/evince"; then
- elog "Please install app-text/evince for print preview functionality."
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
- elog "add it to your settings.ini file."
- fi
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- if [[ -z ${REPLACED_BY_VERSION} ]]; then
- multilib_pkg_postrm() {
- rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
- }
- multilib_foreach_abi multilib_pkg_postrm
- fi
-}
diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
deleted file mode 100644
index fff54273..00000000
--- a/x11-libs/gtk+/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>martin@mvath.de</email>
- <name>Martin Väth</name>
- <description>maintainer of the updates in the mv overlay</description>
- </maintainer>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <longdescription>
- GTK+ is a multi-platform toolkit for creating graphical user
- interfaces. Offering a complete set of widgets, GTK+ is suitable
- for projects ranging from small one-off projects to complete
- application suites.
- </longdescription>
- <use>
- <flag name="adwaita-icon-theme">Force the adwaita-icon-theme</flag>
- <flag name="atk-bridge">Enable the gtk3-atk-bridge, hard depending on app-accessibility/at-spi2-atk and thus on sys-apps/dbus</flag>
- <flag name="broadway">Enable the GDK Broadway backend.</flag>
- <flag name="cloudprint">Enable printing via Google Cloud Print.</flag>
- <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management in printing</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
deleted file mode 100644
index bf817dd3..00000000
--- a/x11-libs/motif/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST motif-2.3.6-patches-2.tar.xz 1600 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619
-DIST motif-2.3.8.tar.gz 5704328 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
diff --git a/x11-libs/motif/files/Mwm.defaults b/x11-libs/motif/files/Mwm.defaults
deleted file mode 100644
index ea91b6fb..00000000
--- a/x11-libs/motif/files/Mwm.defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-Mwm*fontList: variable
-Mwm*iconClick: False
-Mwm*iconPlacement: top left
-Mwm*moveOpaque: True
-Mwm*rootButtonClick: True
-Mwm*foreground: #000000
-Mwm*background: #B8B8C0
-Mwm*enableThinThickness: True
-Mwm*enableEtchedInMenu: True
-Mwm*menu*fontList: -adobe-helvetica-medium-r-*--*-120-*-*-*-*-*-*
-Mwm*client*title*fontList: -adobe-helvetica-bold-r-*--*-100-*-*-*-*-*-*
-Mwm*icon*fontList: -adobe-helvetica-bold-r-*--*-80-*-*-*-*-*-*
-Mwm*feedback*fontList: -adobe-helvetica-bold-r-*--*-100-*-*-*-*-*-*
-Mwm*multiClickTime: 300
diff --git a/x11-libs/motif/metadata.xml b/x11-libs/motif/metadata.xml
deleted file mode 100644
index 40ef2c33..00000000
--- a/x11-libs/motif/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>ulm@gentoo.org</email>
- </maintainer>
- <use>
- <flag name="motif22-compatibility">Compatibility with Open Motif 2.2</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">motif</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r1.ebuild
deleted file mode 100644
index 3f08c9ba..00000000
--- a/x11-libs/motif/motif-2.3.8-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="The Motif user interface component toolkit"
-HOMEPAGE="https://sourceforge.net/projects/motif/
- http://motif.ics.com/"
-SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
- https://dev.gentoo.org/~ulm/distfiles/${PN}-2.3.6-patches-2.tar.xz"
-
-LICENSE="LGPL-2.1+ MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
- jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
- unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
- xft? (
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
- )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/flex
- || ( sys-devel/bison dev-util/byacc sys-freebsd/freebsd-ubin )
- x11-base/xorg-proto
- x11-misc/xbitmaps"
-
-src_prepare() {
- eapply ../patch
- default
-
- # disable compilation of demo binaries
- sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
-
- # add X.Org vendor string to aliases for virtual bindings
- echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
-
- AT_M4DIR=. eautoreconf
-
- # get around some LANG problems in make (#15119)
- LANG=C
-
- # bug #80421
- filter-flags -ftracer
-
- # feel free to fix properly if you care
- append-flags -fno-strict-aliasing
-
- # for Solaris Xos_r.h :(
- [[ ${CHOST} == *-solaris2.11 ]] \
- && append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
-
- if use !elibc_glibc && use !elibc_uclibc && use !elibc_musl \
- && use unicode; then
- # libiconv detection in configure script doesn't always work
- # http://bugs.motifzone.net/show_bug.cgi?id=1423
- export LIBS="${LIBS} -liconv"
- fi
-
- # "bison -y" causes runtime crashes #355795
- command -v byacc >/dev/null 2>&1 && export YACC=byacc
-
- # remember the name of the C compiler for the native ABI
- MY_NATIVE_CC=$(tc-getCC)
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --with-x \
- --disable-printing \
- $(use_enable static-libs static) \
- $(use_enable motif22-compatibility) \
- $(use_enable unicode utf8) \
- $(use_enable xft) \
- $(use_enable jpeg) \
- $(use_enable png)
-}
-
-multilib_src_compile() {
- # The wmluiltok build tool is linked with libfl.a, so always
- # compile it for the native ABI
- emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
- emake
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi && use examples; then
- emake -C demos DESTDIR="${D}" install-data
- dodir /usr/share/doc/${PF}/demos
- mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
- fi
-}
-
-multilib_src_install_all() {
- # mwm default configs
- insinto /usr/share/X11/app-defaults
- newins "${FILESDIR}"/Mwm.defaults Mwm
-
- # cleanup
- rm -rf "${ED}"/usr/share/Xm
- find "${D}" -type f -name "*.la" -delete || die
-
- dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
-}
diff --git a/x11-themes/fvwm-crystal/ChangeLog b/x11-themes/fvwm-crystal/ChangeLog
new file mode 100644
index 00000000..90d16157
--- /dev/null
+++ b/x11-themes/fvwm-crystal/ChangeLog
@@ -0,0 +1,37 @@
+# ChangeLog for x11-themes/fvwm-crystal
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*fvwm-crystal-3.3.2-r1 (08 Mar 2014)
+
+ 24 Sep 2014; Martin Väth <martin@mvath.de>:
+ Cosmetical changes to make repoman happy
+
+ 08 Mar 2014; Martin Väth <martin@mvath.de>:
+ Fix some path handling; thanks for feedback from upstream developer
+ Dominique Michel. Do not install LICENSE file (is globally in gentoo).
+
+*fvwm-crystal-3.3.2 (23 Jan 2014)
+
+ 08 Mar 2014; Martin Väth <martin@mvath.de>:
+ Fix some path handling; thanks for feedback from upstream developer
+ Dominique Michel. Do not install LICENSE file (is globally in gentoo).
+
+ 23 Jan 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*fvwm-crystal-3.3.0-r1 (24 Jan 2014)
+
+ 24 Jan 2014; Martin Väth <martin@mvath.de>:
+ Do not install duplicate into /usr/local. Honour $EPREFIX
+
+*fvwm-crystal-3.3.0 (23 Jan 2014)
+
+ 23 Jan 2014; Martin Väth <martin@mvath.de>:
+ Version bump, remove old ebuild
+
+*fvwm-crystal-3.2.7 (12 Oct 2013)
+
+ 12 Oct 2013; Martin Väth <martin@mvath.de>:
+ Fork from main tree to get earlier revbump: In particular, bashisms are
+ fixed in newer versions of fvwm-crystal. Removing previous ChangeLog.
diff --git a/x11-themes/fvwm-crystal/Manifest b/x11-themes/fvwm-crystal/Manifest
index 22e9dbe5..c5554730 100644
--- a/x11-themes/fvwm-crystal/Manifest
+++ b/x11-themes/fvwm-crystal/Manifest
@@ -1 +1 @@
-DIST fvwm-crystal-3.6.5.tar.gz 5899049 BLAKE2B addd82dbbab9b457a94715a969a27ff6ef2be07cddd33a379dc4d5348c9565d3a19943828b068ec5ef5f6d032f51b77a1990316ee7b3e16e5dc98ddf32f98c7d SHA512 45cd99b83342e5e5f0de89edc92dbba3311efc7ef431d509490e3fd5b49420e94d1cef55865f45e731fd4c13172c6e2d26fbd10107cdb4a4f525379e17b94e6d
+DIST fvwm-crystal-3.3.2.tar.gz 4702096 SHA256 f0e5cd7b0a4920438229cf58a5854cc018d18fce982b42f250e624b15a1deb49 SHA512 0532aefd78c20ecdd51f01a734ae73d0c359e3afeab9838029613d4c44405a6c7b3d61b9581c4de0b7977ccaad7ea6353cf3e35b07c2940493560c7099581da7 WHIRLPOOL 9295e9d9c32f8961d522f378d176d3061a9461033cf9c2363034dac835b97f91757daacdaa83e1e601d064c34a68d0c70a280d79e86a4b167df347deeddc2973
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.3.2-r1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.3.2-r1.ebuild
new file mode 100644
index 00000000..47d582a7
--- /dev/null
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.3.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+RESTRICT=mirror
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils readme.gentoo python-r1
+
+DESCRIPTION="Configurable and full featured FVWM theme, with lots of transparency and freedesktop compatible menu"
+HOMEPAGE="http://fvwm-crystal.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+ x11-misc/xdg-user-dirs
+ >=x11-wm/fvwm-2.6.5[png]
+ || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+ || ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
+ || ( x11-misc/hsetroot media-gfx/feh )
+ sys-apps/sed
+ sys-devel/bc
+ virtual/awk
+ x11-apps/xwd"
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="After installation, execute the following commands:
+\ \$ cp -r "${EROOT}"usr/share/doc/"${PF}"/addons/Xresources ~/.Xresources
+\ \$ cp -r "${EROOT}"usr/share/doc/"${PF}"/addons/Xsession ~/.xinitrc
+
+Many applications can extend functionality of fvwm-crystal.
+They are listed in "${EROOT}"usr/share/doc/"${PF}"/INSTALL.*
+
+Some icons fixes were committed recently.
+To achieve the same fixes on your private icon files,
+please read "${EROOT}"usr/share/doc/"${PF}"/INSTALL.*
+This will fix the libpng warnings at stderr.
+
+The color themes was updated to Fvwm InfoStore.
+To know how to update your custom color themes, please run
+ "${EROOT}"usr/share/"${PN}"/addons/convert_colorsets"
+
+src_prepare() {
+ epatch_user
+}
+
+src_install() {
+ emake DESTDIR="${ED}" \
+ docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
+ prefix="${EPREFIX%/}/usr" \
+ install
+ # GNU License is globally in the portage tree
+ rm -vf "${ED}/usr/share/doc/${PF}"/LICENSE
+
+ python_replicate_script \
+ "${ED}/usr/bin/${PN}".{apps,wallpaper} \
+ "${ED}/usr/share/${PN}"/fvwm/scripts/FvwmMPD/*.py
+ readme.gentoo_create_doc
+}
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.6.5.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.6.5.ebuild
deleted file mode 100644
index 4f8d7633..00000000
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.6.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-inherit readme.gentoo-r1 python-single-r1
-
-DESCRIPTION="Configurable FVWM theme with transparency and freedesktop compatible menu"
-HOMEPAGE="http://fvwm-crystal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE=""
-
-case ${PV} in
-*9999)
- inherit subversion
- ESVN_REPO_URI="svn://svn.code.sf.net/p/fvwm-crystal/code"
- SRC_URI=""
- S="${WORKDIR}/${PN}"
- src_unpack() {
- subversion_src_unpack
- };;
-esac
-
-RDEPEND="${PYTHON_DEPS}
- acct-group/fvwm-crystal
- >=x11-wm/fvwm-2.6.9[png]
- virtual/imagemagick-tools
- || ( >=x11-misc/stalonetray-0.6.2-r2 x11-misc/trayer )
- || ( x11-misc/hsetroot media-gfx/feh )
- sys-apps/sed
- sys-devel/bc
- virtual/awk
- x11-apps/xwd
- media-sound/alsa-utils"
-
-DISABLE_AUTOFORMATTING="true"
-DOC_CONTENTS="After a first time installation, execute the following commands:
- $ cp -r "${EROOT}"/usr/share/doc/"${PF}"/addons/Xresources ~/.Xresources
- $ cp -r "${EROOT}"/usr/share/doc/"${PF}"/addons/Xsession ~/.xinitrc
-You can edit these files at your convenience.
-
-Many applications can extend functionality of fvwm-crystal.
-They are listed in "${EROOT}"/usr/share/doc/"${PF}"/INSTALL.*
-
-To be able to use the exit menu, each user using ${PN}
-must be in the group fvwm-crystal.
-You can do that as root with:
- $ useradd -G fvwm-crystal <user_name>
-and log out and in again.
-"
-
-src_install() {
- emake DESTDIR="${ED}" \
- docdir="${EPREFIX}/usr/share/doc/${PF}" \
- prefix="${EPREFIX}/usr" \
- install
- # GNU License is globally in the portage tree
- rm -vf "${ED}/usr/share/doc/${PF}"/LICENSE
-
- python_doscript "${ED}/usr/bin/${PN}".{apps,wallpaper}
- python_scriptinto "/usr/share/${PN}"/fvwm/scripts/FvwmMPD
- python_doscript "${ED}/usr/share/${PN}"/fvwm/scripts/FvwmMPD/*.py
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- elog "Many applications can extend functionality of fvwm-crystal."
- elog "They are listed in ${EROOT}/usr/share/doc/${PF}/INSTALL.bz2"
- elog "Popular supported softwares are:"
- elog "- x11-misc/xdg-user-dirs (the gtk USE is not needed) to"
- elog " get localized XDG user directories support"
- elog "- sys-apps/systemd for hibernate/resume support"
- elog "- media-sound/jack-audio-connection-kit for a professional sound server"
- elog "- several media players"
-}
diff --git a/x11-themes/fvwm-crystal/metadata.xml b/x11-themes/fvwm-crystal/metadata.xml
index c77a6de3..5f357c6b 100644
--- a/x11-themes/fvwm-crystal/metadata.xml
+++ b/x11-themes/fvwm-crystal/metadata.xml
@@ -1,15 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>dominique.c.michel@gmail.com</email>
- <name>Dominique Michel</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <longdescription>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>dominique.michel@vtxnet.ch</email>
+ <name>Dominique Michel</name>
+</maintainer>
+<longdescription>
FVWM-Crystal is a set of configuration files for FVWM window manager,
with additional programs and scripts. Some of it's features are:
* quick launching of a terminal with just one click on a desktop
@@ -21,7 +18,4 @@ with additional programs and scripts. Some of it's features are:
desktop pages
* transparent window titlebars, menus and panels on the desktop
</longdescription>
- <upstream>
- <remote-id type="sourceforge">fvwm-crystal</remote-id>
- </upstream>
</pkgmetadata>