summaryrefslogtreecommitdiff
path: root/app-emacs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 21:03:06 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 21:03:06 +0100
commit8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-emacs
parent30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/Manifest.gzbin47469 -> 34195 bytes
-rw-r--r--app-emacs/actionscript-mode-7.2.2_p2012040512
-rw-r--r--app-emacs/actionscript-mode-7.2.2_p2014060512
-rw-r--r--app-emacs/actionscript-mode/Manifest6
-rw-r--r--app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20120405.ebuild26
-rw-r--r--app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20140605.ebuild26
-rw-r--r--app-emacs/actionscript-mode/files/50actionscript-mode-gentoo.el5
-rw-r--r--app-emacs/actionscript-mode/metadata.xml12
-rw-r--r--app-emacs/adaptive-wrap-0.512
-rw-r--r--app-emacs/adaptive-wrap/Manifest4
-rw-r--r--app-emacs/adaptive-wrap/adaptive-wrap-0.5.ebuild21
-rw-r--r--app-emacs/adaptive-wrap/files/50adaptive-wrap-gentoo.el4
-rw-r--r--app-emacs/adaptive-wrap/metadata.xml9
-rw-r--r--app-emacs/analog-1.9.9912
-rw-r--r--app-emacs/analog/Manifest4
-rw-r--r--app-emacs/analog/analog-1.9.99.ebuild17
-rw-r--r--app-emacs/analog/files/50analog-gentoo.el2
-rw-r--r--app-emacs/analog/metadata.xml18
-rw-r--r--app-emacs/anything-1.3.213
-rw-r--r--app-emacs/anything/Manifest4
-rw-r--r--app-emacs/anything/anything-1.3.2.ebuild39
-rw-r--r--app-emacs/anything/files/50anything-gentoo.el2
-rw-r--r--app-emacs/anything/metadata.xml12
-rw-r--r--app-emacs/apache-mode-1.112
-rw-r--r--app-emacs/apache-mode/Manifest4
-rw-r--r--app-emacs/apache-mode/apache-mode-1.1.ebuild17
-rw-r--r--app-emacs/apache-mode/files/50apache-mode-gentoo.el8
-rw-r--r--app-emacs/apache-mode/metadata.xml9
-rw-r--r--app-emacs/apel-10.8-r112
-rw-r--r--app-emacs/apel/Manifest8
-rw-r--r--app-emacs/apel/apel-10.8-r1.ebuild51
-rw-r--r--app-emacs/apel/files/50apel-gentoo.el1
-rw-r--r--app-emacs/apel/files/apel-10.8-010_ikazuhiro.patch189
-rw-r--r--app-emacs/apel/files/apel-10.8-020_Prevent-fontset-error.patch32
-rw-r--r--app-emacs/apel/files/apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch27
-rw-r--r--app-emacs/apel/metadata.xml9
-rw-r--r--app-emacs/atomic-chrome-2.0.012
-rw-r--r--app-emacs/atomic-chrome/Manifest4
-rw-r--r--app-emacs/atomic-chrome/atomic-chrome-2.0.0.ebuild21
-rw-r--r--app-emacs/atomic-chrome/files/50atomic-chrome-gentoo.el5
-rw-r--r--app-emacs/atomic-chrome/metadata.xml20
-rw-r--r--app-emacs/auctex-11.8913
-rw-r--r--app-emacs/auctex-11.9013
-rw-r--r--app-emacs/auctex-11.9213
-rw-r--r--app-emacs/auctex-12.113
-rw-r--r--app-emacs/auctex/Manifest11
-rw-r--r--app-emacs/auctex/auctex-11.89.ebuild59
-rw-r--r--app-emacs/auctex/auctex-11.90.ebuild59
-rw-r--r--app-emacs/auctex/auctex-11.92.ebuild60
-rw-r--r--app-emacs/auctex/auctex-12.1.ebuild61
-rw-r--r--app-emacs/auctex/files/50auctex-gentoo.el8
-rw-r--r--app-emacs/auctex/files/60auctex-gentoo.el4
-rw-r--r--app-emacs/auctex/metadata.xml26
-rw-r--r--app-emacs/auto-complete-1.3.113
-rw-r--r--app-emacs/auto-complete/Manifest4
-rw-r--r--app-emacs/auto-complete/auto-complete-1.3.1.ebuild33
-rw-r--r--app-emacs/auto-complete/files/50auto-complete-gentoo.el3
-rw-r--r--app-emacs/auto-complete/metadata.xml12
-rw-r--r--app-emacs/autoconf-mode-2.6912
-rw-r--r--app-emacs/autoconf-mode/Manifest4
-rw-r--r--app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild17
-rw-r--r--app-emacs/autoconf-mode/files/50autoconf-mode-gentoo.el9
-rw-r--r--app-emacs/autoconf-mode/metadata.xml9
-rw-r--r--app-emacs/basic-toolkit-0.312
-rw-r--r--app-emacs/basic-toolkit/Manifest4
-rw-r--r--app-emacs/basic-toolkit/basic-toolkit-0.3.ebuild25
-rw-r--r--app-emacs/basic-toolkit/files/50basic-toolkit-gentoo.el2
-rw-r--r--app-emacs/basic-toolkit/metadata.xml9
-rw-r--r--app-emacs/bbdb-2.35-r113
-rw-r--r--app-emacs/bbdb-3.1.214
-rw-r--r--app-emacs/bbdb/Manifest10
-rw-r--r--app-emacs/bbdb/bbdb-2.35-r1.ebuild67
-rw-r--r--app-emacs/bbdb/bbdb-3.1.2.ebuild60
-rw-r--r--app-emacs/bbdb/files/50bbdb-gentoo-3.1.2.el2
-rw-r--r--app-emacs/bbdb/files/50bbdb-gentoo.el4
-rw-r--r--app-emacs/bbdb/files/bbdb-3.1.2-no-init.patch126
-rw-r--r--app-emacs/bbdb/metadata.xml21
-rw-r--r--app-emacs/binclock-1.7-r112
-rw-r--r--app-emacs/binclock/Manifest4
-rw-r--r--app-emacs/binclock/binclock-1.7-r1.ebuild17
-rw-r--r--app-emacs/binclock/files/50binclock-gentoo.el2
-rw-r--r--app-emacs/binclock/metadata.xml9
-rw-r--r--app-emacs/bison-mode-0.312
-rw-r--r--app-emacs/bison-mode/Manifest4
-rw-r--r--app-emacs/bison-mode/bison-mode-0.3.ebuild17
-rw-r--r--app-emacs/bison-mode/files/50bison-mode-gentoo.el3
-rw-r--r--app-emacs/bison-mode/metadata.xml16
-rw-r--r--app-emacs/blogmax-2011030512
-rw-r--r--app-emacs/blogmax/Manifest5
-rw-r--r--app-emacs/blogmax/blogmax-20110305.ebuild43
-rw-r--r--app-emacs/blogmax/files/50blogmax-gentoo.el4
-rw-r--r--app-emacs/blogmax/files/README.Gentoo8
-rw-r--r--app-emacs/blogmax/metadata.xml12
-rw-r--r--app-emacs/bm-1.32_p2014021412
-rw-r--r--app-emacs/bm/Manifest4
-rw-r--r--app-emacs/bm/bm-1.32_p20140214.ebuild21
-rw-r--r--app-emacs/bm/files/50bm-gentoo.el4
-rw-r--r--app-emacs/bm/metadata.xml13
-rw-r--r--app-emacs/bongo-2011062113
-rw-r--r--app-emacs/bongo/Manifest7
-rw-r--r--app-emacs/bongo/bongo-20110621.ebuild40
-rw-r--r--app-emacs/bongo/files/50bongo-gentoo.el4
-rw-r--r--app-emacs/bongo/files/bongo-20070619-fix-require.patch11
-rw-r--r--app-emacs/bongo/files/bongo-20110621-texinfo-5.patch12
-rw-r--r--app-emacs/bongo/metadata.xml37
-rw-r--r--app-emacs/boxquote-1.2312
-rw-r--r--app-emacs/boxquote/Manifest4
-rw-r--r--app-emacs/boxquote/boxquote-1.23.ebuild22
-rw-r--r--app-emacs/boxquote/files/50boxquote-gentoo.el2
-rw-r--r--app-emacs/boxquote/metadata.xml23
-rw-r--r--app-emacs/browse-kill-ring-1.3c12
-rw-r--r--app-emacs/browse-kill-ring/Manifest4
-rw-r--r--app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild19
-rw-r--r--app-emacs/browse-kill-ring/files/50browse-kill-ring-gentoo.el5
-rw-r--r--app-emacs/browse-kill-ring/metadata.xml19
-rw-r--r--app-emacs/bubblet-0.74-r112
-rw-r--r--app-emacs/bubblet/Manifest4
-rw-r--r--app-emacs/bubblet/bubblet-0.74-r1.ebuild16
-rw-r--r--app-emacs/bubblet/files/50bubblet-gentoo.el2
-rw-r--r--app-emacs/bubblet/metadata.xml9
-rw-r--r--app-emacs/buffer-extension-0.112
-rw-r--r--app-emacs/buffer-extension/Manifest4
-rw-r--r--app-emacs/buffer-extension/buffer-extension-0.1.ebuild25
-rw-r--r--app-emacs/buffer-extension/files/50buffer-extension-gentoo.el2
-rw-r--r--app-emacs/buffer-extension/metadata.xml9
-rw-r--r--app-emacs/calfw-1.313
-rw-r--r--app-emacs/calfw/Manifest4
-rw-r--r--app-emacs/calfw/calfw-1.3.ebuild29
-rw-r--r--app-emacs/calfw/files/50calfw-gentoo.el2
-rw-r--r--app-emacs/calfw/metadata.xml19
-rw-r--r--app-emacs/chess-2.0.412
-rw-r--r--app-emacs/chess/Manifest6
-rw-r--r--app-emacs/chess/chess-2.0.4.ebuild41
-rw-r--r--app-emacs/chess/files/50chess-gentoo-2.0.4.el36
-rw-r--r--app-emacs/chess/metadata.xml30
-rw-r--r--app-emacs/circe-1.312
-rw-r--r--app-emacs/circe-2.712
-rw-r--r--app-emacs/circe/Manifest6
-rw-r--r--app-emacs/circe/circe-1.3.ebuild19
-rw-r--r--app-emacs/circe/circe-2.7.ebuild20
-rw-r--r--app-emacs/circe/files/50circe-gentoo.el2
-rw-r--r--app-emacs/circe/metadata.xml12
-rw-r--r--app-emacs/cldoc-1.1612
-rw-r--r--app-emacs/cldoc/Manifest4
-rw-r--r--app-emacs/cldoc/cldoc-1.16.ebuild19
-rw-r--r--app-emacs/cldoc/files/50cldoc-gentoo.el13
-rw-r--r--app-emacs/cldoc/metadata.xml21
-rw-r--r--app-emacs/cmail-2.62-r113
-rw-r--r--app-emacs/cmail/Manifest4
-rw-r--r--app-emacs/cmail/cmail-2.62-r1.ebuild51
-rw-r--r--app-emacs/cmail/files/70cmail-gentoo.el5
-rw-r--r--app-emacs/cmail/metadata.xml12
-rw-r--r--app-emacs/color-browser-0.3-r112
-rw-r--r--app-emacs/color-browser/Manifest5
-rw-r--r--app-emacs/color-browser/color-browser-0.3-r1.ebuild20
-rw-r--r--app-emacs/color-browser/files/0.3-gentoo.patch80
-rw-r--r--app-emacs/color-browser/files/60color-browser-gentoo.el6
-rw-r--r--app-emacs/color-browser/metadata.xml17
-rw-r--r--app-emacs/color-moccur-2.7312
-rw-r--r--app-emacs/color-moccur/Manifest4
-rw-r--r--app-emacs/color-moccur/color-moccur-2.73.ebuild18
-rw-r--r--app-emacs/color-moccur/files/50color-moccur-gentoo.el12
-rw-r--r--app-emacs/color-moccur/metadata.xml9
-rw-r--r--app-emacs/color-theme-6.6.0-r112
-rw-r--r--app-emacs/color-theme/Manifest5
-rw-r--r--app-emacs/color-theme/color-theme-6.6.0-r1.ebuild33
-rw-r--r--app-emacs/color-theme/files/50color-theme-gentoo.el109
-rw-r--r--app-emacs/color-theme/files/color-theme-6.6.0-replace-in-string.patch30
-rw-r--r--app-emacs/color-theme/metadata.xml9
-rw-r--r--app-emacs/company-mode-0.6.1414
-rw-r--r--app-emacs/company-mode-0.714
-rw-r--r--app-emacs/company-mode/Manifest6
-rw-r--r--app-emacs/company-mode/company-mode-0.6.14.ebuild38
-rw-r--r--app-emacs/company-mode/company-mode-0.7.ebuild38
-rw-r--r--app-emacs/company-mode/files/50company-mode-gentoo.el2
-rw-r--r--app-emacs/company-mode/metadata.xml16
-rw-r--r--app-emacs/crontab-mode-1.2012
-rw-r--r--app-emacs/crontab-mode/Manifest4
-rw-r--r--app-emacs/crontab-mode/crontab-mode-1.20.ebuild16
-rw-r--r--app-emacs/crontab-mode/files/50crontab-mode-gentoo.el3
-rw-r--r--app-emacs/crontab-mode/metadata.xml9
-rw-r--r--app-emacs/crypt++-2.9212
-rw-r--r--app-emacs/crypt++-2.94_pre2008043012
-rw-r--r--app-emacs/crypt++/Manifest6
-rw-r--r--app-emacs/crypt++/crypt++-2.92.ebuild17
-rw-r--r--app-emacs/crypt++/crypt++-2.94_pre20080430.ebuild17
-rw-r--r--app-emacs/crypt++/files/50crypt++-gentoo.el2
-rw-r--r--app-emacs/crypt++/metadata.xml17
-rw-r--r--app-emacs/csharp-mode-0.7.0-r112
-rw-r--r--app-emacs/csharp-mode-0.9.012
-rw-r--r--app-emacs/csharp-mode/Manifest7
-rw-r--r--app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild17
-rw-r--r--app-emacs/csharp-mode/csharp-mode-0.9.0.ebuild22
-rw-r--r--app-emacs/csharp-mode/files/50csharp-mode-gentoo.el3
-rw-r--r--app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch14
-rw-r--r--app-emacs/csharp-mode/metadata.xml12
-rw-r--r--app-emacs/css-mode-0.11-r112
-rw-r--r--app-emacs/css-mode/Manifest5
-rw-r--r--app-emacs/css-mode/css-mode-0.11-r1.ebuild28
-rw-r--r--app-emacs/css-mode/files/50css-mode-gentoo.el3
-rw-r--r--app-emacs/css-mode/files/css-mode-0.11-no-compat-kbd.patch24
-rw-r--r--app-emacs/css-mode/metadata.xml9
-rw-r--r--app-emacs/csv-mode-1.5012
-rw-r--r--app-emacs/csv-mode/Manifest4
-rw-r--r--app-emacs/csv-mode/csv-mode-1.50.ebuild16
-rw-r--r--app-emacs/csv-mode/files/50csv-mode-gentoo.el4
-rw-r--r--app-emacs/csv-mode/metadata.xml9
-rw-r--r--app-emacs/cycle-buffer-2.1612
-rw-r--r--app-emacs/cycle-buffer/Manifest4
-rw-r--r--app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild22
-rw-r--r--app-emacs/cycle-buffer/files/50cycle-buffer-gentoo.el2
-rw-r--r--app-emacs/cycle-buffer/metadata.xml9
-rw-r--r--app-emacs/d-mode-2.0.612
-rw-r--r--app-emacs/d-mode/Manifest5
-rw-r--r--app-emacs/d-mode/d-mode-2.0.6.ebuild19
-rw-r--r--app-emacs/d-mode/files/50d-mode-gentoo.el3
-rw-r--r--app-emacs/d-mode/files/d-mode-2.0.6-emacs-24.4.patch13
-rw-r--r--app-emacs/d-mode/metadata.xml12
-rw-r--r--app-emacs/dash-2.13.012
-rw-r--r--app-emacs/dash-2.14.112
-rw-r--r--app-emacs/dash/Manifest6
-rw-r--r--app-emacs/dash/dash-2.13.0.ebuild25
-rw-r--r--app-emacs/dash/dash-2.14.1.ebuild25
-rw-r--r--app-emacs/dash/files/50dash-gentoo.el1
-rw-r--r--app-emacs/dash/metadata.xml12
-rw-r--r--app-emacs/ddskk-16.213
-rw-r--r--app-emacs/ddskk/Manifest4
-rw-r--r--app-emacs/ddskk/ddskk-16.2.ebuild68
-rw-r--r--app-emacs/ddskk/files/50ddskk-gentoo.el4
-rw-r--r--app-emacs/ddskk/metadata.xml15
-rw-r--r--app-emacs/desktop+-0.213
-rw-r--r--app-emacs/desktop+/Manifest4
-rw-r--r--app-emacs/desktop+/desktop+-0.2.ebuild27
-rw-r--r--app-emacs/desktop+/files/50desktop+-gentoo.el2
-rw-r--r--app-emacs/desktop+/metadata.xml12
-rw-r--r--app-emacs/develock-0.4512
-rw-r--r--app-emacs/develock/Manifest4
-rw-r--r--app-emacs/develock/develock-0.45.ebuild18
-rw-r--r--app-emacs/develock/files/50develock-gentoo.el3
-rw-r--r--app-emacs/develock/metadata.xml9
-rw-r--r--app-emacs/df-mode-2005050912
-rw-r--r--app-emacs/df-mode/Manifest4
-rw-r--r--app-emacs/df-mode/df-mode-20050509.ebuild18
-rw-r--r--app-emacs/df-mode/files/50df-mode-gentoo.el2
-rw-r--r--app-emacs/df-mode/metadata.xml9
-rw-r--r--app-emacs/dictionary-1.1012
-rw-r--r--app-emacs/dictionary/Manifest4
-rw-r--r--app-emacs/dictionary/dictionary-1.10.ebuild18
-rw-r--r--app-emacs/dictionary/files/50dictionary-gentoo.el2
-rw-r--r--app-emacs/dictionary/metadata.xml9
-rw-r--r--app-emacs/dircolors-1.0-r212
-rw-r--r--app-emacs/dircolors/Manifest4
-rw-r--r--app-emacs/dircolors/dircolors-1.0-r2.ebuild16
-rw-r--r--app-emacs/dircolors/files/50dircolors-gentoo.el4
-rw-r--r--app-emacs/dircolors/metadata.xml9
-rw-r--r--app-emacs/dired-sort-menu-1.2612
-rw-r--r--app-emacs/dired-sort-menu/Manifest4
-rw-r--r--app-emacs/dired-sort-menu/dired-sort-menu-1.26.ebuild16
-rw-r--r--app-emacs/dired-sort-menu/files/50dired-sort-menu-gentoo.el3
-rw-r--r--app-emacs/dired-sort-menu/metadata.xml9
-rw-r--r--app-emacs/distel-4.0.613
-rw-r--r--app-emacs/distel/Manifest4
-rw-r--r--app-emacs/distel/distel-4.0.6.ebuild38
-rw-r--r--app-emacs/distel/files/50distel-gentoo.el4
-rw-r--r--app-emacs/distel/metadata.xml12
-rw-r--r--app-emacs/doctest-mode-0.412
-rw-r--r--app-emacs/doctest-mode/Manifest4
-rw-r--r--app-emacs/doctest-mode/doctest-mode-0.4.ebuild24
-rw-r--r--app-emacs/doctest-mode/files/60doctest-mode-gentoo.el4
-rw-r--r--app-emacs/doctest-mode/metadata.xml12
-rw-r--r--app-emacs/doxymacs-1.8.0-r312
-rw-r--r--app-emacs/doxymacs/Manifest5
-rw-r--r--app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild35
-rw-r--r--app-emacs/doxymacs/files/50doxymacs-gentoo.el12
-rw-r--r--app-emacs/doxymacs/files/doxymacs-1.8.0-gcc7.patch104
-rw-r--r--app-emacs/doxymacs/metadata.xml11
-rw-r--r--app-emacs/dropdown-list-2012032912
-rw-r--r--app-emacs/dropdown-list/Manifest5
-rw-r--r--app-emacs/dropdown-list/dropdown-list-20120329.ebuild17
-rw-r--r--app-emacs/dropdown-list/files/50dropdown-list-gentoo.el2
-rw-r--r--app-emacs/dropdown-list/files/dropdown-list-20090814-selection-face.patch13
-rw-r--r--app-emacs/dropdown-list/metadata.xml9
-rw-r--r--app-emacs/dts-mode-0.1.0_pre2014101412
-rw-r--r--app-emacs/dts-mode/Manifest4
-rw-r--r--app-emacs/dts-mode/dts-mode-0.1.0_pre20141014.ebuild18
-rw-r--r--app-emacs/dts-mode/files/50dts-mode-gentoo.el6
-rw-r--r--app-emacs/dts-mode/metadata.xml12
-rw-r--r--app-emacs/ebuild-mode-1.4212
-rw-r--r--app-emacs/ebuild-mode-1.4312
-rw-r--r--app-emacs/ebuild-mode-1.4413
-rw-r--r--app-emacs/ebuild-mode/Manifest8
-rw-r--r--app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild22
-rw-r--r--app-emacs/ebuild-mode/ebuild-mode-1.43.ebuild22
-rw-r--r--app-emacs/ebuild-mode/ebuild-mode-1.44.ebuild22
-rw-r--r--app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.39.el16
-rw-r--r--app-emacs/ebuild-mode/metadata.xml15
-rw-r--r--app-emacs/ecb-2.41_pre20140215-r113
-rw-r--r--app-emacs/ecb/Manifest5
-rw-r--r--app-emacs/ecb/ecb-2.41_pre20140215-r1.ebuild51
-rw-r--r--app-emacs/ecb/files/70ecb-gentoo.el2
-rw-r--r--app-emacs/ecb/files/ecb-2.32-gentoo.patch73
-rw-r--r--app-emacs/ecb/metadata.xml39
-rw-r--r--app-emacs/edb-1.3112
-rw-r--r--app-emacs/edb-1.3212
-rw-r--r--app-emacs/edb/Manifest7
-rw-r--r--app-emacs/edb/edb-1.31.ebuild36
-rw-r--r--app-emacs/edb/edb-1.32.ebuild35
-rw-r--r--app-emacs/edb/files/50edb-gentoo.el4
-rw-r--r--app-emacs/edb/files/edb-1.31-skram-path.patch11
-rw-r--r--app-emacs/edb/metadata.xml9
-rw-r--r--app-emacs/edit-list-0.312
-rw-r--r--app-emacs/edit-list/Manifest4
-rw-r--r--app-emacs/edit-list/edit-list-0.3.ebuild17
-rw-r--r--app-emacs/edit-list/files/50edit-list-gentoo.el3
-rw-r--r--app-emacs/edit-list/metadata.xml15
-rw-r--r--app-emacs/edit-server-1.1512
-rw-r--r--app-emacs/edit-server/Manifest4
-rw-r--r--app-emacs/edit-server/edit-server-1.15.ebuild20
-rw-r--r--app-emacs/edit-server/files/50edit-server-gentoo.el2
-rw-r--r--app-emacs/edit-server/metadata.xml20
-rw-r--r--app-emacs/editorconfig-emacs-0.7.8-r113
-rw-r--r--app-emacs/editorconfig-emacs/Manifest4
-rw-r--r--app-emacs/editorconfig-emacs/editorconfig-emacs-0.7.8-r1.ebuild21
-rw-r--r--app-emacs/editorconfig-emacs/files/50editorconfig-emacs-gentoo.el7
-rw-r--r--app-emacs/editorconfig-emacs/metadata.xml15
-rw-r--r--app-emacs/elib-1.0-r112
-rw-r--r--app-emacs/elib/Manifest5
-rw-r--r--app-emacs/elib/elib-1.0-r1.ebuild33
-rw-r--r--app-emacs/elib/files/50elib-gentoo.el1
-rw-r--r--app-emacs/elib/files/elib-1.0-texinfo-5.patch14
-rw-r--r--app-emacs/elib/metadata.xml12
-rw-r--r--app-emacs/elscreen-1.4.6-r112
-rw-r--r--app-emacs/elscreen/Manifest6
-rw-r--r--app-emacs/elscreen/elscreen-1.4.6-r1.ebuild33
-rw-r--r--app-emacs/elscreen/files/50elscreen-gentoo.el1
-rw-r--r--app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch154
-rw-r--r--app-emacs/elscreen/files/elscreen-1.4.6-void-variable-argi.patch71
-rw-r--r--app-emacs/elscreen/metadata.xml23
-rw-r--r--app-emacs/emacs-common-gentoo-1.6-r113
-rw-r--r--app-emacs/emacs-common-gentoo/Manifest3
-rw-r--r--app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild106
-rw-r--r--app-emacs/emacs-common-gentoo/metadata.xml12
-rw-r--r--app-emacs/emacs-daemon-0.2212
-rw-r--r--app-emacs/emacs-daemon/Manifest3
-rw-r--r--app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild53
-rw-r--r--app-emacs/emacs-daemon/metadata.xml9
-rw-r--r--app-emacs/emacs-jabber-0.8.9212
-rw-r--r--app-emacs/emacs-jabber/Manifest4
-rw-r--r--app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild23
-rw-r--r--app-emacs/emacs-jabber/files/50emacs-jabber-gentoo.el4
-rw-r--r--app-emacs/emacs-jabber/metadata.xml12
-rw-r--r--app-emacs/emacs-w3m-1.4.528_pre2014021313
-rw-r--r--app-emacs/emacs-w3m-1.4.570_pre2017020313
-rw-r--r--app-emacs/emacs-w3m-1.4.625_pre2018051813
-rw-r--r--app-emacs/emacs-w3m/Manifest8
-rw-r--r--app-emacs/emacs-w3m/emacs-w3m-1.4.528_pre20140213.ebuild48
-rw-r--r--app-emacs/emacs-w3m/emacs-w3m-1.4.570_pre20170203.ebuild51
-rw-r--r--app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild51
-rw-r--r--app-emacs/emacs-w3m/files/70emacs-w3m-gentoo.el3
-rw-r--r--app-emacs/emacs-w3m/metadata.xml9
-rw-r--r--app-emacs/emacs-wget-0.5.0-r113
-rw-r--r--app-emacs/emacs-wget/Manifest4
-rw-r--r--app-emacs/emacs-wget/emacs-wget-0.5.0-r1.ebuild26
-rw-r--r--app-emacs/emacs-wget/files/50emacs-wget-gentoo.el4
-rw-r--r--app-emacs/emacs-wget/metadata.xml9
-rw-r--r--app-emacs/emhacks-20070920-r112
-rw-r--r--app-emacs/emhacks/Manifest4
-rw-r--r--app-emacs/emhacks/emhacks-20070920-r1.ebuild25
-rw-r--r--app-emacs/emhacks/files/50emhacks-gentoo.el28
-rw-r--r--app-emacs/emhacks/metadata.xml23
-rw-r--r--app-emacs/emms-3.0-r112
-rw-r--r--app-emacs/emms-4.112
-rw-r--r--app-emacs/emms-4.312
-rw-r--r--app-emacs/emms-4.412
-rw-r--r--app-emacs/emms/Manifest12
-rw-r--r--app-emacs/emms/emms-3.0-r1.ebuild40
-rw-r--r--app-emacs/emms/emms-4.1.ebuild38
-rw-r--r--app-emacs/emms/emms-4.3.ebuild38
-rw-r--r--app-emacs/emms/emms-4.4.ebuild38
-rw-r--r--app-emacs/emms/files/50emms-gentoo.el2
-rw-r--r--app-emacs/emms/files/emms-3.0-Makefile.patch11
-rw-r--r--app-emacs/emms/files/emms-3.0-texinfo-5.patch17
-rw-r--r--app-emacs/emms/metadata.xml19
-rw-r--r--app-emacs/erobot-2.1.0-r112
-rw-r--r--app-emacs/erobot/Manifest5
-rw-r--r--app-emacs/erobot/erobot-2.1.0-r1.ebuild17
-rw-r--r--app-emacs/erobot/files/50erobot-gentoo.el4
-rw-r--r--app-emacs/erobot/files/erobot-2.1.0-fix-interactive.patch11
-rw-r--r--app-emacs/erobot/metadata.xml9
-rw-r--r--app-emacs/eselect-mode-1.4.1212
-rw-r--r--app-emacs/eselect-mode-1.4.1312
-rw-r--r--app-emacs/eselect-mode-999910
-rw-r--r--app-emacs/eselect-mode/Manifest7
-rw-r--r--app-emacs/eselect-mode/eselect-mode-1.4.12.ebuild18
-rw-r--r--app-emacs/eselect-mode/eselect-mode-1.4.13.ebuild18
-rw-r--r--app-emacs/eselect-mode/eselect-mode-9999.ebuild19
-rw-r--r--app-emacs/eselect-mode/files/50eselect-mode-gentoo.el3
-rw-r--r--app-emacs/eselect-mode/metadata.xml15
-rw-r--r--app-emacs/ess-15.09.212
-rw-r--r--app-emacs/ess-16.0412
-rw-r--r--app-emacs/ess-17.1112
-rw-r--r--app-emacs/ess/Manifest8
-rw-r--r--app-emacs/ess/ess-15.09.2.ebuild45
-rw-r--r--app-emacs/ess/ess-16.04.ebuild43
-rw-r--r--app-emacs/ess/ess-17.11.ebuild43
-rw-r--r--app-emacs/ess/files/50ess-gentoo.el2
-rw-r--r--app-emacs/ess/metadata.xml9
-rw-r--r--app-emacs/evil-1.0.813
-rw-r--r--app-emacs/evil-1.2.1313
-rw-r--r--app-emacs/evil/Manifest6
-rw-r--r--app-emacs/evil/evil-1.0.8.ebuild25
-rw-r--r--app-emacs/evil/evil-1.2.13.ebuild24
-rw-r--r--app-emacs/evil/files/50evil-gentoo.el2
-rw-r--r--app-emacs/evil/metadata.xml9
-rw-r--r--app-emacs/expand-region-0.11.012
-rw-r--r--app-emacs/expand-region/Manifest4
-rw-r--r--app-emacs/expand-region/expand-region-0.11.0.ebuild23
-rw-r--r--app-emacs/expand-region/files/50expand-region-gentoo.el2
-rw-r--r--app-emacs/expand-region/metadata.xml12
-rw-r--r--app-emacs/f-0.18.213
-rw-r--r--app-emacs/f-0.19.013
-rw-r--r--app-emacs/f/Manifest6
-rw-r--r--app-emacs/f/f-0.18.2.ebuild22
-rw-r--r--app-emacs/f/f-0.19.0.ebuild22
-rw-r--r--app-emacs/f/files/50f-gentoo.el1
-rw-r--r--app-emacs/f/metadata.xml12
-rw-r--r--app-emacs/fff-2005051712
-rw-r--r--app-emacs/fff/Manifest4
-rw-r--r--app-emacs/fff/fff-20050517.ebuild18
-rw-r--r--app-emacs/fff/files/50fff-gentoo.el17
-rw-r--r--app-emacs/fff/metadata.xml17
-rw-r--r--app-emacs/filladapt-2.12-r112
-rw-r--r--app-emacs/filladapt/Manifest4
-rw-r--r--app-emacs/filladapt/files/50filladapt-gentoo.el1
-rw-r--r--app-emacs/filladapt/filladapt-2.12-r1.ebuild20
-rw-r--r--app-emacs/filladapt/metadata.xml9
-rw-r--r--app-emacs/flashcard-2.3.312
-rw-r--r--app-emacs/flashcard/Manifest4
-rw-r--r--app-emacs/flashcard/files/50flashcard-gentoo.el5
-rw-r--r--app-emacs/flashcard/flashcard-2.3.3.ebuild16
-rw-r--r--app-emacs/flashcard/metadata.xml9
-rw-r--r--app-emacs/flim-1.14.9-r212
-rw-r--r--app-emacs/flim/Manifest5
-rw-r--r--app-emacs/flim/files/60flim-gentoo.el1
-rw-r--r--app-emacs/flim/files/flim-1.14.9-mel-q-ccl.patch31
-rw-r--r--app-emacs/flim/flim-1.14.9-r2.ebuild37
-rw-r--r--app-emacs/flim/metadata.xml9
-rw-r--r--app-emacs/folding-2012.0226.162312
-rw-r--r--app-emacs/folding-2013.0613.182112
-rw-r--r--app-emacs/folding/Manifest6
-rw-r--r--app-emacs/folding/files/50folding-gentoo.el4
-rw-r--r--app-emacs/folding/folding-2012.0226.1623.ebuild17
-rw-r--r--app-emacs/folding/folding-2013.0613.1821.ebuild17
-rw-r--r--app-emacs/folding/metadata.xml9
-rw-r--r--app-emacs/ghc-mod-5.4.0.014
-rw-r--r--app-emacs/ghc-mod-5.5.0.0-r114
-rw-r--r--app-emacs/ghc-mod-5.7.0.014
-rw-r--r--app-emacs/ghc-mod/Manifest9
-rw-r--r--app-emacs/ghc-mod/files/50ghc-mod-gentoo.el3
-rw-r--r--app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch5
-rw-r--r--app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild94
-rw-r--r--app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild96
-rw-r--r--app-emacs/ghc-mod/ghc-mod-5.7.0.0.ebuild91
-rw-r--r--app-emacs/ghc-mod/metadata.xml20
-rw-r--r--app-emacs/ghub-2.0.012
-rw-r--r--app-emacs/ghub-2.0.112
-rw-r--r--app-emacs/ghub/Manifest6
-rw-r--r--app-emacs/ghub/files/50ghub-gentoo.el3
-rw-r--r--app-emacs/ghub/ghub-2.0.0.ebuild21
-rw-r--r--app-emacs/ghub/ghub-2.0.1.ebuild21
-rw-r--r--app-emacs/ghub/metadata.xml30
-rw-r--r--app-emacs/gnuplot-mode-0.7.013
-rw-r--r--app-emacs/gnuplot-mode/Manifest4
-rw-r--r--app-emacs/gnuplot-mode/files/50gnuplot-mode-gentoo.el6
-rw-r--r--app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild43
-rw-r--r--app-emacs/gnuplot-mode/metadata.xml12
-rw-r--r--app-emacs/gnuserv-3.12.8-r313
-rw-r--r--app-emacs/gnuserv/Manifest5
-rw-r--r--app-emacs/gnuserv/files/50gnuserv-gentoo.el5
-rw-r--r--app-emacs/gnuserv/files/gnuclient.desktop13
-rw-r--r--app-emacs/gnuserv/gnuserv-3.12.8-r3.ebuild69
-rw-r--r--app-emacs/gnuserv/metadata.xml8
-rw-r--r--app-emacs/go-mode-1.4.012
-rw-r--r--app-emacs/go-mode-1.5.012
-rw-r--r--app-emacs/go-mode/Manifest6
-rw-r--r--app-emacs/go-mode/files/50go-mode-gentoo.el2
-rw-r--r--app-emacs/go-mode/go-mode-1.4.0.ebuild18
-rw-r--r--app-emacs/go-mode/go-mode-1.5.0.ebuild18
-rw-r--r--app-emacs/go-mode/metadata.xml12
-rw-r--r--app-emacs/google-c-style-20091009-r112
-rw-r--r--app-emacs/google-c-style/Manifest4
-rw-r--r--app-emacs/google-c-style/files/50google-c-style-gentoo.el5
-rw-r--r--app-emacs/google-c-style/google-c-style-20091009-r1.ebuild26
-rw-r--r--app-emacs/google-c-style/metadata.xml16
-rw-r--r--app-emacs/graphviz-dot-mode-0.3.712
-rw-r--r--app-emacs/graphviz-dot-mode/Manifest4
-rw-r--r--app-emacs/graphviz-dot-mode/files/50graphviz-dot-mode-gentoo.el5
-rw-r--r--app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild18
-rw-r--r--app-emacs/graphviz-dot-mode/metadata.xml9
-rw-r--r--app-emacs/h4x0r-0.13-r112
-rw-r--r--app-emacs/h4x0r/Manifest4
-rw-r--r--app-emacs/h4x0r/files/50h4x0r-gentoo.el4
-rw-r--r--app-emacs/h4x0r/h4x0r-0.13-r1.ebuild16
-rw-r--r--app-emacs/h4x0r/metadata.xml9
-rw-r--r--app-emacs/haskell-mode-13.0712
-rw-r--r--app-emacs/haskell-mode-16.112
-rw-r--r--app-emacs/haskell-mode-2.9.112
-rw-r--r--app-emacs/haskell-mode/Manifest8
-rw-r--r--app-emacs/haskell-mode/files/50haskell-mode-gentoo.el1
-rw-r--r--app-emacs/haskell-mode/haskell-mode-13.07.ebuild46
-rw-r--r--app-emacs/haskell-mode/haskell-mode-16.1.ebuild46
-rw-r--r--app-emacs/haskell-mode/haskell-mode-2.9.1.ebuild40
-rw-r--r--app-emacs/haskell-mode/metadata.xml12
-rw-r--r--app-emacs/hexrgb-0_p95712
-rw-r--r--app-emacs/hexrgb/Manifest4
-rw-r--r--app-emacs/hexrgb/files/50hexrgb-gentoo.el1
-rw-r--r--app-emacs/hexrgb/hexrgb-0_p957.ebuild16
-rw-r--r--app-emacs/hexrgb/metadata.xml9
-rw-r--r--app-emacs/highline-7.2.212
-rw-r--r--app-emacs/highline/Manifest4
-rw-r--r--app-emacs/highline/files/50highline-gentoo.el2
-rw-r--r--app-emacs/highline/highline-7.2.2.ebuild22
-rw-r--r--app-emacs/highline/metadata.xml9
-rw-r--r--app-emacs/howm-1.4.312
-rw-r--r--app-emacs/howm/Manifest4
-rw-r--r--app-emacs/howm/files/50howm-gentoo.el2
-rw-r--r--app-emacs/howm/howm-1.4.3.ebuild30
-rw-r--r--app-emacs/howm/metadata.xml12
-rw-r--r--app-emacs/htmlize-1.4312
-rw-r--r--app-emacs/htmlize-1.4712
-rw-r--r--app-emacs/htmlize/Manifest6
-rw-r--r--app-emacs/htmlize/files/50htmlize-gentoo.el11
-rw-r--r--app-emacs/htmlize/htmlize-1.43.ebuild18
-rw-r--r--app-emacs/htmlize/htmlize-1.47.ebuild17
-rw-r--r--app-emacs/htmlize/metadata.xml9
-rw-r--r--app-emacs/httpd-1.112
-rw-r--r--app-emacs/httpd/Manifest4
-rw-r--r--app-emacs/httpd/files/50httpd-gentoo.el1
-rw-r--r--app-emacs/httpd/httpd-1.1.ebuild17
-rw-r--r--app-emacs/httpd/metadata.xml9
-rw-r--r--app-emacs/icicles-2013.04.23.2340012
-rw-r--r--app-emacs/icicles-2018.02.13.2373312
-rw-r--r--app-emacs/icicles/Manifest6
-rw-r--r--app-emacs/icicles/files/50icicles-gentoo.el3
-rw-r--r--app-emacs/icicles/icicles-2013.04.23.23400.ebuild16
-rw-r--r--app-emacs/icicles/icicles-2018.02.13.23733.ebuild18
-rw-r--r--app-emacs/icicles/metadata.xml12
-rw-r--r--app-emacs/identica-mode-1.1-r112
-rw-r--r--app-emacs/identica-mode/Manifest4
-rw-r--r--app-emacs/identica-mode/files/50identica-mode-gentoo.el2
-rw-r--r--app-emacs/identica-mode/identica-mode-1.1-r1.ebuild27
-rw-r--r--app-emacs/identica-mode/metadata.xml9
-rw-r--r--app-emacs/igrep-2.11312
-rw-r--r--app-emacs/igrep/Manifest4
-rw-r--r--app-emacs/igrep/files/50igrep-gentoo.el33
-rw-r--r--app-emacs/igrep/igrep-2.113.ebuild16
-rw-r--r--app-emacs/igrep/metadata.xml9
-rw-r--r--app-emacs/inform-mode-1.5.812
-rw-r--r--app-emacs/inform-mode-1.6.212
-rw-r--r--app-emacs/inform-mode/Manifest6
-rw-r--r--app-emacs/inform-mode/files/50inform-mode-gentoo.el5
-rw-r--r--app-emacs/inform-mode/inform-mode-1.5.8.ebuild18
-rw-r--r--app-emacs/inform-mode/inform-mode-1.6.2.ebuild18
-rw-r--r--app-emacs/inform-mode/metadata.xml9
-rw-r--r--app-emacs/initsplit-1.7_pre2014020312
-rw-r--r--app-emacs/initsplit/Manifest4
-rw-r--r--app-emacs/initsplit/files/50initsplit-gentoo.el2
-rw-r--r--app-emacs/initsplit/initsplit-1.7_pre20140203.ebuild22
-rw-r--r--app-emacs/initsplit/metadata.xml9
-rw-r--r--app-emacs/jam-mode-0.312
-rw-r--r--app-emacs/jam-mode/Manifest4
-rw-r--r--app-emacs/jam-mode/files/50jam-mode-gentoo.el5
-rw-r--r--app-emacs/jam-mode/jam-mode-0.3.ebuild17
-rw-r--r--app-emacs/jam-mode/metadata.xml9
-rw-r--r--app-emacs/jasmin-1.2-r212
-rw-r--r--app-emacs/jasmin/Manifest4
-rw-r--r--app-emacs/jasmin/files/50jasmin-gentoo.el4
-rw-r--r--app-emacs/jasmin/jasmin-1.2-r2.ebuild16
-rw-r--r--app-emacs/jasmin/metadata.xml15
-rw-r--r--app-emacs/jde-2.4.113
-rw-r--r--app-emacs/jde/Manifest7
-rw-r--r--app-emacs/jde/files/70jde-gentoo.el10
-rw-r--r--app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch69
-rw-r--r--app-emacs/jde/files/jde-2.4.0.1-fix-paths-gentoo.patch218
-rw-r--r--app-emacs/jde/files/jde-2.4.1-doc-directory.patch53
-rw-r--r--app-emacs/jde/jde-2.4.1.ebuild74
-rw-r--r--app-emacs/jde/metadata.xml31
-rw-r--r--app-emacs/keywiz-1.412
-rw-r--r--app-emacs/keywiz/Manifest4
-rw-r--r--app-emacs/keywiz/files/50keywiz-gentoo.el2
-rw-r--r--app-emacs/keywiz/keywiz-1.4.ebuild16
-rw-r--r--app-emacs/keywiz/metadata.xml9
-rw-r--r--app-emacs/limit-1.14.10_pre20081125233212
-rw-r--r--app-emacs/limit/Manifest4
-rw-r--r--app-emacs/limit/files/60flim-gentoo.el1
-rw-r--r--app-emacs/limit/limit-1.14.10_pre200811252332.ebuild40
-rw-r--r--app-emacs/limit/metadata.xml9
-rw-r--r--app-emacs/lookup-1.4.112
-rw-r--r--app-emacs/lookup/Manifest5
-rw-r--r--app-emacs/lookup/files/50lookup-gentoo.el4
-rw-r--r--app-emacs/lookup/files/lookup-1.4.1-garbage-char.patch8
-rw-r--r--app-emacs/lookup/lookup-1.4.1.ebuild33
-rw-r--r--app-emacs/lookup/metadata.xml13
-rw-r--r--app-emacs/lua-mode-2013041912
-rw-r--r--app-emacs/lua-mode/Manifest4
-rw-r--r--app-emacs/lua-mode/files/50lua-mode-gentoo.el4
-rw-r--r--app-emacs/lua-mode/lua-mode-20130419.ebuild18
-rw-r--r--app-emacs/lua-mode/metadata.xml12
-rw-r--r--app-emacs/lyskom-elisp-client-0.48_p2013123113
-rw-r--r--app-emacs/lyskom-elisp-client-0.48_p2016123113
-rw-r--r--app-emacs/lyskom-elisp-client-0.48_p2018041013
-rw-r--r--app-emacs/lyskom-elisp-client/Manifest9
-rw-r--r--app-emacs/lyskom-elisp-client/files/50lyskom-elisp-client-gentoo.el2
-rw-r--r--app-emacs/lyskom-elisp-client/files/lyskom-elisp-client-0.48_p20161231-no-git.patch20
-rw-r--r--app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20131231.ebuild37
-rw-r--r--app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20161231.ebuild44
-rw-r--r--app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20180410.ebuild44
-rw-r--r--app-emacs/lyskom-elisp-client/metadata.xml9
-rw-r--r--app-emacs/magit-2.11.012
-rw-r--r--app-emacs/magit-2.12.112
-rw-r--r--app-emacs/magit-2.13.012
-rw-r--r--app-emacs/magit-popup-2.12.312
-rw-r--r--app-emacs/magit-popup/Manifest4
-rw-r--r--app-emacs/magit-popup/files/50magit-popup-gentoo.el1
-rw-r--r--app-emacs/magit-popup/magit-popup-2.12.3.ebuild24
-rw-r--r--app-emacs/magit-popup/metadata.xml28
-rw-r--r--app-emacs/magit/Manifest8
-rw-r--r--app-emacs/magit/files/50magit-gentoo.el2
-rw-r--r--app-emacs/magit/magit-2.11.0.ebuild29
-rw-r--r--app-emacs/magit/magit-2.12.1.ebuild34
-rw-r--r--app-emacs/magit/magit-2.13.0.ebuild34
-rw-r--r--app-emacs/magit/metadata.xml22
-rw-r--r--app-emacs/mailcrypt-3.5.913
-rw-r--r--app-emacs/mailcrypt/Manifest4
-rw-r--r--app-emacs/mailcrypt/files/50mailcrypt-gentoo.el1
-rw-r--r--app-emacs/mailcrypt/mailcrypt-3.5.9.ebuild41
-rw-r--r--app-emacs/mailcrypt/metadata.xml12
-rw-r--r--app-emacs/markdown-mode-2.112
-rw-r--r--app-emacs/markdown-mode-2.312
-rw-r--r--app-emacs/markdown-mode/Manifest7
-rw-r--r--app-emacs/markdown-mode/files/50markdown-mode-gentoo.el5
-rw-r--r--app-emacs/markdown-mode/files/markdown-mode-2.1-text-auto-mode.patch23
-rw-r--r--app-emacs/markdown-mode/markdown-mode-2.1.ebuild21
-rw-r--r--app-emacs/markdown-mode/markdown-mode-2.3.ebuild24
-rw-r--r--app-emacs/markdown-mode/metadata.xml12
-rw-r--r--app-emacs/matlab-3.3.2_pre2013082912
-rw-r--r--app-emacs/matlab/Manifest4
-rw-r--r--app-emacs/matlab/files/50matlab-gentoo.el2
-rw-r--r--app-emacs/matlab/matlab-3.3.2_pre20130829.ebuild18
-rw-r--r--app-emacs/matlab/metadata.xml12
-rw-r--r--app-emacs/mediawiki-2.2.4.112
-rw-r--r--app-emacs/mediawiki/Manifest4
-rw-r--r--app-emacs/mediawiki/files/50mediawiki-gentoo.el10
-rw-r--r--app-emacs/mediawiki/mediawiki-2.2.4.1.ebuild16
-rw-r--r--app-emacs/mediawiki/metadata.xml12
-rw-r--r--app-emacs/metadata.xml36
-rw-r--r--app-emacs/mew-6.514
-rw-r--r--app-emacs/mew-6.614
-rw-r--r--app-emacs/mew/Manifest6
-rw-r--r--app-emacs/mew/files/50mew-gentoo.el7
-rw-r--r--app-emacs/mew/metadata.xml8
-rw-r--r--app-emacs/mew/mew-6.5.ebuild47
-rw-r--r--app-emacs/mew/mew-6.6.ebuild45
-rw-r--r--app-emacs/mic-paren-3.1112
-rw-r--r--app-emacs/mic-paren/Manifest4
-rw-r--r--app-emacs/mic-paren/files/50mic-paren-gentoo.el10
-rw-r--r--app-emacs/mic-paren/metadata.xml16
-rw-r--r--app-emacs/mic-paren/mic-paren-3.11.ebuild18
-rw-r--r--app-emacs/mldonkey-0.0.4b-r112
-rw-r--r--app-emacs/mldonkey/Manifest6
-rw-r--r--app-emacs/mldonkey/files/50mldonkey-gentoo.el18
-rw-r--r--app-emacs/mldonkey/files/mldonkey-0.0.4b-emacs-26.patch14
-rw-r--r--app-emacs/mldonkey/files/mldonkey-0.0.4b-vd.patch121
-rw-r--r--app-emacs/mldonkey/metadata.xml9
-rw-r--r--app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild34
-rw-r--r--app-emacs/mmm-mode-0.5.412
-rw-r--r--app-emacs/mmm-mode/Manifest4
-rw-r--r--app-emacs/mmm-mode/files/50mmm-mode-gentoo.el2
-rw-r--r--app-emacs/mmm-mode/metadata.xml13
-rw-r--r--app-emacs/mmm-mode/mmm-mode-0.5.4.ebuild20
-rw-r--r--app-emacs/moccur-edit-2.1612
-rw-r--r--app-emacs/moccur-edit/Manifest4
-rw-r--r--app-emacs/moccur-edit/files/60moccur-edit-gentoo.el3
-rw-r--r--app-emacs/moccur-edit/metadata.xml9
-rw-r--r--app-emacs/moccur-edit/moccur-edit-2.16.ebuild21
-rw-r--r--app-emacs/mode-compile-2.29.112
-rw-r--r--app-emacs/mode-compile/Manifest4
-rw-r--r--app-emacs/mode-compile/files/50mode-compile-gentoo.el5
-rw-r--r--app-emacs/mode-compile/metadata.xml12
-rw-r--r--app-emacs/mode-compile/mode-compile-2.29.1.ebuild17
-rw-r--r--app-emacs/mpg123-el-1.5912
-rw-r--r--app-emacs/mpg123-el-1.6012
-rw-r--r--app-emacs/mpg123-el/Manifest6
-rw-r--r--app-emacs/mpg123-el/files/50mpg123-el-gentoo.el3
-rw-r--r--app-emacs/mpg123-el/metadata.xml8
-rw-r--r--app-emacs/mpg123-el/mpg123-el-1.59.ebuild35
-rw-r--r--app-emacs/mpg123-el/mpg123-el-1.60.ebuild31
-rw-r--r--app-emacs/mu-cite-8.1_p20070903041312
-rw-r--r--app-emacs/mu-cite-8.1_p20120227233012
-rw-r--r--app-emacs/mu-cite/Manifest6
-rw-r--r--app-emacs/mu-cite/files/50mu-cite-gentoo.el3
-rw-r--r--app-emacs/mu-cite/metadata.xml13
-rw-r--r--app-emacs/mu-cite/mu-cite-8.1_p200709030413.ebuild27
-rw-r--r--app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild27
-rw-r--r--app-emacs/multi-term-1.312
-rw-r--r--app-emacs/multi-term/Manifest4
-rw-r--r--app-emacs/multi-term/files/50multi-term-gentoo.el7
-rw-r--r--app-emacs/multi-term/metadata.xml12
-rw-r--r--app-emacs/multi-term/multi-term-1.3.ebuild17
-rw-r--r--app-emacs/multiple-cursors-1.3.012
-rw-r--r--app-emacs/multiple-cursors/Manifest4
-rw-r--r--app-emacs/multiple-cursors/files/50multiple-cursors-gentoo.el2
-rw-r--r--app-emacs/multiple-cursors/metadata.xml12
-rw-r--r--app-emacs/multiple-cursors/multiple-cursors-1.3.0.ebuild23
-rw-r--r--app-emacs/muse-3.2014
-rw-r--r--app-emacs/muse/Manifest4
-rw-r--r--app-emacs/muse/files/50muse-gentoo.el2
-rw-r--r--app-emacs/muse/metadata.xml34
-rw-r--r--app-emacs/muse/muse-3.20.ebuild34
-rw-r--r--app-emacs/nagios-mode-0.312
-rw-r--r--app-emacs/nagios-mode/Manifest4
-rw-r--r--app-emacs/nagios-mode/files/50nagios-mode-gentoo.el4
-rw-r--r--app-emacs/nagios-mode/metadata.xml9
-rw-r--r--app-emacs/nagios-mode/nagios-mode-0.3.ebuild18
-rw-r--r--app-emacs/navi2ch-1.8.4-r112
-rw-r--r--app-emacs/navi2ch/Manifest4
-rw-r--r--app-emacs/navi2ch/files/50navi2ch-gentoo.el2
-rw-r--r--app-emacs/navi2ch/metadata.xml16
-rw-r--r--app-emacs/navi2ch/navi2ch-1.8.4-r1.ebuild44
-rw-r--r--app-emacs/nxml-docbook5-schemas-2008092212
-rw-r--r--app-emacs/nxml-docbook5-schemas/Manifest5
-rw-r--r--app-emacs/nxml-docbook5-schemas/files/60nxml-docbook5-schemas-gentoo.el5
-rw-r--r--app-emacs/nxml-docbook5-schemas/files/schemas.xml4
-rw-r--r--app-emacs/nxml-docbook5-schemas/metadata.xml9
-rw-r--r--app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-20080922.ebuild27
-rw-r--r--app-emacs/nxml-gentoo-schemas-2017030212
-rw-r--r--app-emacs/nxml-gentoo-schemas-2018061112
-rw-r--r--app-emacs/nxml-gentoo-schemas/Manifest6
-rw-r--r--app-emacs/nxml-gentoo-schemas/files/60nxml-gentoo-schemas-gentoo.el5
-rw-r--r--app-emacs/nxml-gentoo-schemas/metadata.xml9
-rw-r--r--app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20170302.ebuild25
-rw-r--r--app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20180611.ebuild25
-rw-r--r--app-emacs/nxml-libvirt-schemas-0.9.712
-rw-r--r--app-emacs/nxml-libvirt-schemas-1.2.112
-rw-r--r--app-emacs/nxml-libvirt-schemas/Manifest8
-rw-r--r--app-emacs/nxml-libvirt-schemas/files/60nxml-libvirt-schemas-gentoo.el5
-rw-r--r--app-emacs/nxml-libvirt-schemas/files/Makefile-trang6
-rw-r--r--app-emacs/nxml-libvirt-schemas/files/schemas.xml12
-rw-r--r--app-emacs/nxml-libvirt-schemas/metadata.xml12
-rw-r--r--app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild54
-rw-r--r--app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild54
-rw-r--r--app-emacs/nxml-svg-schemas-1.1.2008112312
-rw-r--r--app-emacs/nxml-svg-schemas/Manifest6
-rw-r--r--app-emacs/nxml-svg-schemas/files/60nxml-svg-schemas-gentoo.el5
-rw-r--r--app-emacs/nxml-svg-schemas/files/Makefile-trang6
-rw-r--r--app-emacs/nxml-svg-schemas/files/schemas.xml13
-rw-r--r--app-emacs/nxml-svg-schemas/metadata.xml8
-rw-r--r--app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild42
-rw-r--r--app-emacs/ocaml-mode-3.12.112
-rw-r--r--app-emacs/ocaml-mode-3.12.1-r112
-rw-r--r--app-emacs/ocaml-mode-4.00.112
-rw-r--r--app-emacs/ocaml-mode/Manifest8
-rw-r--r--app-emacs/ocaml-mode/files/50ocaml-mode-gentoo-3.12.1.el10
-rw-r--r--app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el10
-rw-r--r--app-emacs/ocaml-mode/metadata.xml13
-rw-r--r--app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild19
-rw-r--r--app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild21
-rw-r--r--app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild19
-rw-r--r--app-emacs/org-mode-8.3.2-r114
-rw-r--r--app-emacs/org-mode-9.0.414
-rw-r--r--app-emacs/org-mode-9.1.1314
-rw-r--r--app-emacs/org-mode/Manifest8
-rw-r--r--app-emacs/org-mode/files/50org-mode-gentoo.el2
-rw-r--r--app-emacs/org-mode/metadata.xml29
-rw-r--r--app-emacs/org-mode/org-mode-8.3.2-r1.ebuild59
-rw-r--r--app-emacs/org-mode/org-mode-9.0.4.ebuild60
-rw-r--r--app-emacs/org-mode/org-mode-9.1.13.ebuild60
-rw-r--r--app-emacs/outline-magic-0.912
-rw-r--r--app-emacs/outline-magic/Manifest4
-rw-r--r--app-emacs/outline-magic/files/50outline-magic-gentoo.el1
-rw-r--r--app-emacs/outline-magic/metadata.xml12
-rw-r--r--app-emacs/outline-magic/outline-magic-0.9.ebuild17
-rw-r--r--app-emacs/paredit-23-r112
-rw-r--r--app-emacs/paredit/Manifest4
-rw-r--r--app-emacs/paredit/files/50paredit-gentoo.el10
-rw-r--r--app-emacs/paredit/metadata.xml9
-rw-r--r--app-emacs/paredit/paredit-23-r1.ebuild22
-rw-r--r--app-emacs/pariemacs-3.1412
-rw-r--r--app-emacs/pariemacs/Manifest5
-rw-r--r--app-emacs/pariemacs/files/64pariemacs-gentoo.el7
-rw-r--r--app-emacs/pariemacs/files/pariemacs-3.14-makefile.patch51
-rw-r--r--app-emacs/pariemacs/metadata.xml11
-rw-r--r--app-emacs/pariemacs/pariemacs-3.14.ebuild38
-rw-r--r--app-emacs/php-mode-1.18.212
-rw-r--r--app-emacs/php-mode-1.5.012
-rw-r--r--app-emacs/php-mode/Manifest6
-rw-r--r--app-emacs/php-mode/files/50php-mode-gentoo.el5
-rw-r--r--app-emacs/php-mode/metadata.xml12
-rw-r--r--app-emacs/php-mode/php-mode-1.18.2.ebuild18
-rw-r--r--app-emacs/php-mode/php-mode-1.5.0.ebuild20
-rw-r--r--app-emacs/planner-3.4214
-rw-r--r--app-emacs/planner/Manifest4
-rw-r--r--app-emacs/planner/files/80planner-gentoo.el4
-rw-r--r--app-emacs/planner/metadata.xml15
-rw-r--r--app-emacs/planner/planner-3.42.ebuild30
-rw-r--r--app-emacs/po-mode-0.19.312
-rw-r--r--app-emacs/po-mode-0.19.412
-rw-r--r--app-emacs/po-mode-0.19.8.112
-rw-r--r--app-emacs/po-mode/Manifest8
-rw-r--r--app-emacs/po-mode/files/50po-mode-gentoo.el8
-rw-r--r--app-emacs/po-mode/metadata.xml9
-rw-r--r--app-emacs/po-mode/po-mode-0.19.3.ebuild18
-rw-r--r--app-emacs/po-mode/po-mode-0.19.4.ebuild18
-rw-r--r--app-emacs/po-mode/po-mode-0.19.8.1.ebuild18
-rw-r--r--app-emacs/popwin-0.6.212
-rw-r--r--app-emacs/popwin/Manifest4
-rw-r--r--app-emacs/popwin/files/50popwin-gentoo.el6
-rw-r--r--app-emacs/popwin/metadata.xml15
-rw-r--r--app-emacs/popwin/popwin-0.6.2.ebuild22
-rw-r--r--app-emacs/pov-mode-3.312
-rw-r--r--app-emacs/pov-mode/Manifest4
-rw-r--r--app-emacs/pov-mode/files/50pov-mode-gentoo.el9
-rw-r--r--app-emacs/pov-mode/metadata.xml9
-rw-r--r--app-emacs/pov-mode/pov-mode-3.3.ebuild29
-rw-r--r--app-emacs/prom-wl-2.7.0-r112
-rw-r--r--app-emacs/prom-wl/Manifest4
-rw-r--r--app-emacs/prom-wl/files/50prom-wl-gentoo.el5
-rw-r--r--app-emacs/prom-wl/metadata.xml9
-rw-r--r--app-emacs/prom-wl/prom-wl-2.7.0-r1.ebuild20
-rw-r--r--app-emacs/proofgeneral-4.212
-rw-r--r--app-emacs/proofgeneral/Manifest5
-rw-r--r--app-emacs/proofgeneral/files/50proofgeneral-gentoo.el2
-rw-r--r--app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch14
-rw-r--r--app-emacs/proofgeneral/metadata.xml9
-rw-r--r--app-emacs/proofgeneral/proofgeneral-4.2.ebuild55
-rw-r--r--app-emacs/protbuf-1.7-r112
-rw-r--r--app-emacs/protbuf/Manifest4
-rw-r--r--app-emacs/protbuf/files/50protbuf-gentoo.el12
-rw-r--r--app-emacs/protbuf/metadata.xml9
-rw-r--r--app-emacs/protbuf/protbuf-1.7-r1.ebuild17
-rw-r--r--app-emacs/psgml-1.4.012
-rw-r--r--app-emacs/psgml/Manifest4
-rw-r--r--app-emacs/psgml/files/50psgml-gentoo.el6
-rw-r--r--app-emacs/psgml/metadata.xml12
-rw-r--r--app-emacs/psgml/psgml-1.4.0.ebuild33
-rw-r--r--app-emacs/puppet-mode-0.3-r112
-rw-r--r--app-emacs/puppet-mode-0.3.2017122113
-rw-r--r--app-emacs/puppet-mode/Manifest7
-rw-r--r--app-emacs/puppet-mode/files/50puppet-mode-1-gentoo.el6
-rw-r--r--app-emacs/puppet-mode/files/puppet-mode-0.3-version.patch20
-rw-r--r--app-emacs/puppet-mode/metadata.xml9
-rw-r--r--app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild24
-rw-r--r--app-emacs/puppet-mode/puppet-mode-0.3.20171221.ebuild29
-rw-r--r--app-emacs/pymacs-0.25-r214
-rw-r--r--app-emacs/pymacs/Manifest4
-rw-r--r--app-emacs/pymacs/files/50pymacs-gentoo.el5
-rw-r--r--app-emacs/pymacs/metadata.xml15
-rw-r--r--app-emacs/pymacs/pymacs-0.25-r2.ebuild54
-rw-r--r--app-emacs/python-mode-6.1.212
-rw-r--r--app-emacs/python-mode-6.2.012
-rw-r--r--app-emacs/python-mode-6.2.312
-rw-r--r--app-emacs/python-mode/Manifest8
-rw-r--r--app-emacs/python-mode/files/50python-mode-gentoo.el11
-rw-r--r--app-emacs/python-mode/metadata.xml12
-rw-r--r--app-emacs/python-mode/python-mode-6.1.2.ebuild21
-rw-r--r--app-emacs/python-mode/python-mode-6.2.0.ebuild21
-rw-r--r--app-emacs/python-mode/python-mode-6.2.3.ebuild21
-rw-r--r--app-emacs/quack-0.4712
-rw-r--r--app-emacs/quack/Manifest4
-rw-r--r--app-emacs/quack/files/50quack-gentoo.el10
-rw-r--r--app-emacs/quack/metadata.xml9
-rw-r--r--app-emacs/quack/quack-0.47.ebuild16
-rw-r--r--app-emacs/quilt-el-0.48.012
-rw-r--r--app-emacs/quilt-el/Manifest6
-rw-r--r--app-emacs/quilt-el/files/50quilt-el-gentoo.el7
-rw-r--r--app-emacs/quilt-el/files/quilt-el-0.45.4-header-window.patch10
-rw-r--r--app-emacs/quilt-el/files/quilt-el-0.48.0-tramp-recursion.patch11
-rw-r--r--app-emacs/quilt-el/metadata.xml17
-rw-r--r--app-emacs/quilt-el/quilt-el-0.48.0.ebuild21
-rw-r--r--app-emacs/qwerty-1.112
-rw-r--r--app-emacs/qwerty/Manifest4
-rw-r--r--app-emacs/qwerty/files/50qwerty-gentoo.el3
-rw-r--r--app-emacs/qwerty/metadata.xml9
-rw-r--r--app-emacs/qwerty/qwerty-1.1.ebuild17
-rw-r--r--app-emacs/redo+-1.1912
-rw-r--r--app-emacs/redo+/Manifest4
-rw-r--r--app-emacs/redo+/files/50redo+-gentoo.el1
-rw-r--r--app-emacs/redo+/metadata.xml9
-rw-r--r--app-emacs/redo+/redo+-1.19.ebuild20
-rw-r--r--app-emacs/regress-1.5.112
-rw-r--r--app-emacs/regress/Manifest5
-rw-r--r--app-emacs/regress/files/1.5.1-regress.el-gentoo.patch11
-rw-r--r--app-emacs/regress/files/50regress-gentoo.el5
-rw-r--r--app-emacs/regress/metadata.xml13
-rw-r--r--app-emacs/regress/regress-1.5.1.ebuild17
-rw-r--r--app-emacs/remember-2.014
-rw-r--r--app-emacs/remember/Manifest5
-rw-r--r--app-emacs/remember/files/50remember-gentoo.el8
-rw-r--r--app-emacs/remember/files/remember-1.9-make-elc.patch11
-rw-r--r--app-emacs/remember/metadata.xml23
-rw-r--r--app-emacs/remember/remember-2.0.ebuild34
-rw-r--r--app-emacs/revive-2.2312
-rw-r--r--app-emacs/revive/Manifest4
-rw-r--r--app-emacs/revive/files/50revive-gentoo.el2
-rw-r--r--app-emacs/revive/metadata.xml9
-rw-r--r--app-emacs/revive/revive-2.23.ebuild22
-rw-r--r--app-emacs/rfcview-0.1312
-rw-r--r--app-emacs/rfcview/Manifest4
-rw-r--r--app-emacs/rfcview/files/50rfcview-gentoo.el4
-rw-r--r--app-emacs/rfcview/metadata.xml9
-rw-r--r--app-emacs/rfcview/rfcview-0.13.ebuild18
-rw-r--r--app-emacs/riece-8.0.014
-rw-r--r--app-emacs/riece-9.0.014
-rw-r--r--app-emacs/riece/Manifest6
-rw-r--r--app-emacs/riece/files/50riece-gentoo.el2
-rw-r--r--app-emacs/riece/metadata.xml9
-rw-r--r--app-emacs/riece/riece-8.0.0.ebuild40
-rw-r--r--app-emacs/riece/riece-9.0.0.ebuild40
-rw-r--r--app-emacs/rnc-mode-1.0_beta312
-rw-r--r--app-emacs/rnc-mode/Manifest4
-rw-r--r--app-emacs/rnc-mode/files/50rnc-mode-gentoo.el7
-rw-r--r--app-emacs/rnc-mode/metadata.xml9
-rw-r--r--app-emacs/rnc-mode/rnc-mode-1.0_beta3.ebuild22
-rw-r--r--app-emacs/rpm-spec-mode-0.1512
-rw-r--r--app-emacs/rpm-spec-mode/Manifest4
-rw-r--r--app-emacs/rpm-spec-mode/files/50rpm-spec-mode-gentoo.el4
-rw-r--r--app-emacs/rpm-spec-mode/metadata.xml9
-rw-r--r--app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.ebuild17
-rw-r--r--app-emacs/ruby-mode-2.0.0_p24712
-rw-r--r--app-emacs/ruby-mode-2.2.212
-rw-r--r--app-emacs/ruby-mode-2.3.012
-rw-r--r--app-emacs/ruby-mode-2.4.112
-rw-r--r--app-emacs/ruby-mode-2.5.012
-rw-r--r--app-emacs/ruby-mode/Manifest17
-rw-r--r--app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.2.2.el12
-rw-r--r--app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.3.0.el12
-rw-r--r--app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.4.1.el12
-rw-r--r--app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.5.0.el12
-rw-r--r--app-emacs/ruby-mode/files/50ruby-mode-gentoo.el11
-rw-r--r--app-emacs/ruby-mode/files/ruby-mode-1.9.3_p429-last-command-char.patch22
-rw-r--r--app-emacs/ruby-mode/metadata.xml9
-rw-r--r--app-emacs/ruby-mode/ruby-mode-2.0.0_p247.ebuild20
-rw-r--r--app-emacs/ruby-mode/ruby-mode-2.2.2.ebuild18
-rw-r--r--app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild18
-rw-r--r--app-emacs/ruby-mode/ruby-mode-2.4.1.ebuild18
-rw-r--r--app-emacs/ruby-mode/ruby-mode-2.5.0.ebuild18
-rw-r--r--app-emacs/rudel-0.3_pre20110721-r112
-rw-r--r--app-emacs/rudel/Manifest5
-rw-r--r--app-emacs/rudel/files/60rudel-gentoo.el13
-rw-r--r--app-emacs/rudel/files/rudel-0.3_pre20110721-emacs25.patch341
-rw-r--r--app-emacs/rudel/metadata.xml20
-rw-r--r--app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild49
-rw-r--r--app-emacs/rust-mode-0.3.0_p2018022112
-rw-r--r--app-emacs/rust-mode/Manifest4
-rw-r--r--app-emacs/rust-mode/files/50rust-mode-gentoo.el3
-rw-r--r--app-emacs/rust-mode/metadata.xml9
-rw-r--r--app-emacs/rust-mode/rust-mode-0.3.0_p20180221.ebuild28
-rw-r--r--app-emacs/s-1.11.012
-rw-r--r--app-emacs/s-1.12.012
-rw-r--r--app-emacs/s/Manifest6
-rw-r--r--app-emacs/s/files/50s-gentoo.el1
-rw-r--r--app-emacs/s/metadata.xml12
-rw-r--r--app-emacs/s/s-1.11.0.ebuild18
-rw-r--r--app-emacs/s/s-1.12.0.ebuild18
-rw-r--r--app-emacs/scala-mode-2.10.312
-rw-r--r--app-emacs/scala-mode/Manifest4
-rw-r--r--app-emacs/scala-mode/files/50scala-mode-gentoo.el2
-rw-r--r--app-emacs/scala-mode/metadata.xml9
-rw-r--r--app-emacs/scala-mode/scala-mode-2.10.3.ebuild21
-rw-r--r--app-emacs/scheme-complete-0.8.1012
-rw-r--r--app-emacs/scheme-complete-0.8.1112
-rw-r--r--app-emacs/scheme-complete/Manifest6
-rw-r--r--app-emacs/scheme-complete/files/60scheme-complete-gentoo.el4
-rw-r--r--app-emacs/scheme-complete/metadata.xml13
-rw-r--r--app-emacs/scheme-complete/scheme-complete-0.8.10.ebuild17
-rw-r--r--app-emacs/scheme-complete/scheme-complete-0.8.11.ebuild16
-rw-r--r--app-emacs/scim-bridge-el-0.8.212
-rw-r--r--app-emacs/scim-bridge-el/Manifest4
-rw-r--r--app-emacs/scim-bridge-el/files/scim-bridge-el-0.8.2-im-agent.patch25
-rw-r--r--app-emacs/scim-bridge-el/metadata.xml18
-rw-r--r--app-emacs/scim-bridge-el/scim-bridge-el-0.8.2.ebuild23
-rw-r--r--app-emacs/scss-mode-2013021512
-rw-r--r--app-emacs/scss-mode-2015010712
-rw-r--r--app-emacs/scss-mode/Manifest6
-rw-r--r--app-emacs/scss-mode/files/50scss-mode-gentoo.el3
-rw-r--r--app-emacs/scss-mode/metadata.xml12
-rw-r--r--app-emacs/scss-mode/scss-mode-20130215.ebuild23
-rw-r--r--app-emacs/scss-mode/scss-mode-20150107.ebuild23
-rw-r--r--app-emacs/semi-1.14.6-r213
-rw-r--r--app-emacs/semi/Manifest5
-rw-r--r--app-emacs/semi/files/65semi-gentoo.el2
-rw-r--r--app-emacs/semi/files/semi-info.patch30
-rw-r--r--app-emacs/semi/metadata.xml9
-rw-r--r--app-emacs/semi/semi-1.14.6-r2.ebuild52
-rw-r--r--app-emacs/session-2.3a12
-rw-r--r--app-emacs/session/Manifest4
-rw-r--r--app-emacs/session/files/50session-gentoo.el1
-rw-r--r--app-emacs/session/metadata.xml12
-rw-r--r--app-emacs/session/session-2.3a.ebuild21
-rw-r--r--app-emacs/setnu-1.0612
-rw-r--r--app-emacs/setnu/Manifest4
-rw-r--r--app-emacs/setnu/files/50setnu-gentoo.el3
-rw-r--r--app-emacs/setnu/metadata.xml9
-rw-r--r--app-emacs/setnu/setnu-1.06.ebuild17
-rw-r--r--app-emacs/slime-2.1515
-rw-r--r--app-emacs/slime-2.2014
-rw-r--r--app-emacs/slime-2.20-r114
-rw-r--r--app-emacs/slime-2.2114
-rw-r--r--app-emacs/slime/Manifest18
-rw-r--r--app-emacs/slime/files/2.0_p20110617/70slime-gentoo.el15
-rw-r--r--app-emacs/slime/files/2.0_p20110617/gentoo-dont-call-init.patch16
-rw-r--r--app-emacs/slime/files/2.0_p20110617/swank.asd98
-rw-r--r--app-emacs/slime/files/2.0_p20130214/gentoo-module-load.patch84
-rw-r--r--app-emacs/slime/files/2.11/dont-load-sbcl-pprint.patch13
-rw-r--r--app-emacs/slime/files/2.11/gentoo-changelog-date.patch20
-rw-r--r--app-emacs/slime/files/2.15/gentoo-changelog-date.patch20
-rw-r--r--app-emacs/slime/files/70slime-gentoo.el13
-rw-r--r--app-emacs/slime/files/slime-2.20-fix-doc-build.patch94
-rw-r--r--app-emacs/slime/files/swank-loader.lisp4
-rw-r--r--app-emacs/slime/metadata.xml44
-rw-r--r--app-emacs/slime/slime-2.15.ebuild123
-rw-r--r--app-emacs/slime/slime-2.20-r1.ebuild74
-rw-r--r--app-emacs/slime/slime-2.20.ebuild71
-rw-r--r--app-emacs/slime/slime-2.21.ebuild69
-rw-r--r--app-emacs/sml-mode-6.412
-rw-r--r--app-emacs/sml-mode/Manifest4
-rw-r--r--app-emacs/sml-mode/files/50sml-mode-gentoo-6.1.el2
-rw-r--r--app-emacs/sml-mode/metadata.xml9
-rw-r--r--app-emacs/sml-mode/sml-mode-6.4.ebuild23
-rw-r--r--app-emacs/sokoban-1.412
-rw-r--r--app-emacs/sokoban/Manifest4
-rw-r--r--app-emacs/sokoban/files/50sokoban-gentoo.el3
-rw-r--r--app-emacs/sokoban/metadata.xml9
-rw-r--r--app-emacs/sokoban/sokoban-1.4.ebuild24
-rw-r--r--app-emacs/ssh-2012070912
-rw-r--r--app-emacs/ssh/Manifest4
-rw-r--r--app-emacs/ssh/files/50ssh-gentoo.el3
-rw-r--r--app-emacs/ssh/metadata.xml9
-rw-r--r--app-emacs/ssh/ssh-20120709.ebuild16
-rw-r--r--app-emacs/stripes-0.2-r112
-rw-r--r--app-emacs/stripes/Manifest4
-rw-r--r--app-emacs/stripes/files/50stripes-gentoo.el3
-rw-r--r--app-emacs/stripes/metadata.xml14
-rw-r--r--app-emacs/stripes/stripes-0.2-r1.ebuild16
-rw-r--r--app-emacs/sumibi-0.5.212
-rw-r--r--app-emacs/sumibi/Manifest4
-rw-r--r--app-emacs/sumibi/files/50sumibi-gentoo.el4
-rw-r--r--app-emacs/sumibi/metadata.xml16
-rw-r--r--app-emacs/sumibi/sumibi-0.5.2.ebuild32
-rw-r--r--app-emacs/tdtd-0.7.1-r112
-rw-r--r--app-emacs/tdtd/Manifest4
-rw-r--r--app-emacs/tdtd/files/50tdtd-gentoo.el28
-rw-r--r--app-emacs/tdtd/metadata.xml9
-rw-r--r--app-emacs/tdtd/tdtd-0.7.1-r1.ebuild22
-rw-r--r--app-emacs/teco-7-r112
-rw-r--r--app-emacs/teco/Manifest6
-rw-r--r--app-emacs/teco/files/50teco-gentoo.el4
-rw-r--r--app-emacs/teco/files/teco-7-emacs-24.patch47
-rw-r--r--app-emacs/teco/files/teco-7-minibuffer-prompt.patch76
-rw-r--r--app-emacs/teco/metadata.xml9
-rw-r--r--app-emacs/teco/teco-7-r1.ebuild23
-rw-r--r--app-emacs/template-3.1c-r112
-rw-r--r--app-emacs/template/Manifest4
-rw-r--r--app-emacs/template/files/50template-gentoo.el20
-rw-r--r--app-emacs/template/metadata.xml12
-rw-r--r--app-emacs/template/template-3.1c-r1.ebuild30
-rw-r--r--app-emacs/tempo-snippets-0.1.512
-rw-r--r--app-emacs/tempo-snippets/Manifest4
-rw-r--r--app-emacs/tempo-snippets/files/50tempo-snippets-gentoo.el2
-rw-r--r--app-emacs/tempo-snippets/metadata.xml9
-rw-r--r--app-emacs/tempo-snippets/tempo-snippets-0.1.5.ebuild17
-rw-r--r--app-emacs/thinks-1.912
-rw-r--r--app-emacs/thinks/Manifest4
-rw-r--r--app-emacs/thinks/files/50thinks-gentoo.el31
-rw-r--r--app-emacs/thinks/metadata.xml9
-rw-r--r--app-emacs/thinks/thinks-1.9.ebuild17
-rw-r--r--app-emacs/thumbs-2.0-r112
-rw-r--r--app-emacs/thumbs/Manifest4
-rw-r--r--app-emacs/thumbs/files/50thumbs-gentoo.el11
-rw-r--r--app-emacs/thumbs/metadata.xml9
-rw-r--r--app-emacs/thumbs/thumbs-2.0-r1.ebuild19
-rw-r--r--app-emacs/tuareg-mode-2.0.1012
-rw-r--r--app-emacs/tuareg-mode-2.0.712
-rw-r--r--app-emacs/tuareg-mode-2.0.812
-rw-r--r--app-emacs/tuareg-mode/Manifest8
-rw-r--r--app-emacs/tuareg-mode/files/50tuareg-mode-gentoo.el6
-rw-r--r--app-emacs/tuareg-mode/metadata.xml22
-rw-r--r--app-emacs/tuareg-mode/tuareg-mode-2.0.10.ebuild18
-rw-r--r--app-emacs/tuareg-mode/tuareg-mode-2.0.7.ebuild19
-rw-r--r--app-emacs/tuareg-mode/tuareg-mode-2.0.8.ebuild19
-rw-r--r--app-emacs/twittering-mode-2.0.013
-rw-r--r--app-emacs/twittering-mode-3.0.013
-rw-r--r--app-emacs/twittering-mode-999911
-rw-r--r--app-emacs/twittering-mode/Manifest6
-rw-r--r--app-emacs/twittering-mode/metadata.xml15
-rw-r--r--app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild40
-rw-r--r--app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild40
-rw-r--r--app-emacs/twittering-mode/twittering-mode-9999.ebuild40
-rw-r--r--app-emacs/typing-1.1.412
-rw-r--r--app-emacs/typing/Manifest4
-rw-r--r--app-emacs/typing/files/50typing-gentoo.el2
-rw-r--r--app-emacs/typing/metadata.xml9
-rw-r--r--app-emacs/typing/typing-1.1.4.ebuild16
-rw-r--r--app-emacs/uboat-1.212
-rw-r--r--app-emacs/uboat/Manifest4
-rw-r--r--app-emacs/uboat/files/50uboat-gentoo.el2
-rw-r--r--app-emacs/uboat/metadata.xml9
-rw-r--r--app-emacs/uboat/uboat-1.2.ebuild17
-rw-r--r--app-emacs/undo-tree-0.5.212
-rw-r--r--app-emacs/undo-tree-0.6.412
-rw-r--r--app-emacs/undo-tree/Manifest6
-rw-r--r--app-emacs/undo-tree/files/50undo-tree-gentoo.el3
-rw-r--r--app-emacs/undo-tree/metadata.xml31
-rw-r--r--app-emacs/undo-tree/undo-tree-0.5.2.ebuild22
-rw-r--r--app-emacs/undo-tree/undo-tree-0.6.4.ebuild19
-rw-r--r--app-emacs/uptimes-2.3-r212
-rw-r--r--app-emacs/uptimes/Manifest4
-rw-r--r--app-emacs/uptimes/files/50uptimes-gentoo.el1
-rw-r--r--app-emacs/uptimes/metadata.xml9
-rw-r--r--app-emacs/uptimes/uptimes-2.3-r2.ebuild19
-rw-r--r--app-emacs/vhdl-mode-3.34.212
-rw-r--r--app-emacs/vhdl-mode-3.35.112
-rw-r--r--app-emacs/vhdl-mode-3.38.112
-rw-r--r--app-emacs/vhdl-mode/Manifest9
-rw-r--r--app-emacs/vhdl-mode/files/50vhdl-mode-gentoo.el3
-rw-r--r--app-emacs/vhdl-mode/files/vhdl-mode-info-dir-gentoo.patch14
-rw-r--r--app-emacs/vhdl-mode/metadata.xml9
-rw-r--r--app-emacs/vhdl-mode/vhdl-mode-3.34.2.ebuild24
-rw-r--r--app-emacs/vhdl-mode/vhdl-mode-3.35.1.ebuild24
-rw-r--r--app-emacs/vhdl-mode/vhdl-mode-3.38.1.ebuild24
-rw-r--r--app-emacs/visual-basic-mode-1.4.1212
-rw-r--r--app-emacs/visual-basic-mode/Manifest4
-rw-r--r--app-emacs/visual-basic-mode/files/50visual-basic-mode-gentoo.el5
-rw-r--r--app-emacs/visual-basic-mode/metadata.xml9
-rw-r--r--app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild17
-rw-r--r--app-emacs/vm-8.1.213
-rw-r--r--app-emacs/vm-8.2.0_beta13
-rw-r--r--app-emacs/vm/Manifest11
-rw-r--r--app-emacs/vm/files/50vm-gentoo-8.0.el4
-rw-r--r--app-emacs/vm/files/50vm-gentoo.el2
-rw-r--r--app-emacs/vm/files/vm-8.0-no-pcrisis.patch21
-rw-r--r--app-emacs/vm/files/vm-8.1.2-texinfo-5.patch59
-rw-r--r--app-emacs/vm/files/vm-8.2.0_beta-datadir.patch31
-rw-r--r--app-emacs/vm/files/vm-8.2.0_beta-texinfo-5.patch250
-rw-r--r--app-emacs/vm/metadata.xml21
-rw-r--r--app-emacs/vm/vm-8.1.2.ebuild50
-rw-r--r--app-emacs/vm/vm-8.2.0_beta.ebuild64
-rw-r--r--app-emacs/volume-1.0-r112
-rw-r--r--app-emacs/volume/Manifest5
-rw-r--r--app-emacs/volume/files/50volume-gentoo.el2
-rw-r--r--app-emacs/volume/files/volume-1.0-mode-line.patch14
-rw-r--r--app-emacs/volume/metadata.xml12
-rw-r--r--app-emacs/volume/volume-1.0-r1.ebuild22
-rw-r--r--app-emacs/w3mnav-0.5-r312
-rw-r--r--app-emacs/w3mnav/Manifest4
-rw-r--r--app-emacs/w3mnav/files/75w3mnav-gentoo.el12
-rw-r--r--app-emacs/w3mnav/metadata.xml17
-rw-r--r--app-emacs/w3mnav/w3mnav-0.5-r3.ebuild24
-rw-r--r--app-emacs/wanderlust-2.14.0-r613
-rw-r--r--app-emacs/wanderlust-2.15.9_p2013061913
-rw-r--r--app-emacs/wanderlust/Manifest9
-rw-r--r--app-emacs/wanderlust/files/50wanderlust-gentoo.el7
-rw-r--r--app-emacs/wanderlust/files/wanderlust-2.14.0-smtp-end-of-line.patch16
-rw-r--r--app-emacs/wanderlust/files/wanderlust-2.14.0-texinfo-garbage.patch11
-rw-r--r--app-emacs/wanderlust/metadata.xml19
-rw-r--r--app-emacs/wanderlust/wanderlust-2.14.0-r6.ebuild62
-rw-r--r--app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild57
-rw-r--r--app-emacs/websocket-1.1012
-rw-r--r--app-emacs/websocket-1.912
-rw-r--r--app-emacs/websocket/Manifest6
-rw-r--r--app-emacs/websocket/files/50websocket-gentoo.el1
-rw-r--r--app-emacs/websocket/metadata.xml9
-rw-r--r--app-emacs/websocket/websocket-1.10.ebuild33
-rw-r--r--app-emacs/websocket/websocket-1.9.ebuild31
-rw-r--r--app-emacs/wgrep-2.1.1012
-rw-r--r--app-emacs/wgrep/Manifest4
-rw-r--r--app-emacs/wgrep/files/50wgrep-gentoo.el1
-rw-r--r--app-emacs/wgrep/metadata.xml16
-rw-r--r--app-emacs/wgrep/wgrep-2.1.10.ebuild19
-rw-r--r--app-emacs/whine-2009122212
-rw-r--r--app-emacs/whine/Manifest4
-rw-r--r--app-emacs/whine/files/50whine-gentoo.el4
-rw-r--r--app-emacs/whine/metadata.xml16
-rw-r--r--app-emacs/whine/whine-20091222.ebuild16
-rw-r--r--app-emacs/wikipedia-mode-0.5-r113
-rw-r--r--app-emacs/wikipedia-mode/Manifest5
-rw-r--r--app-emacs/wikipedia-mode/files/50wikipedia-mode-gentoo.el7
-rw-r--r--app-emacs/wikipedia-mode/files/wikipedia-mode-0.5-require-outline-magic.patch6
-rw-r--r--app-emacs/wikipedia-mode/metadata.xml19
-rw-r--r--app-emacs/wikipedia-mode/wikipedia-mode-0.5-r1.ebuild24
-rw-r--r--app-emacs/windows-2.4912
-rw-r--r--app-emacs/windows/Manifest4
-rw-r--r--app-emacs/windows/files/50windows-gentoo.el2
-rw-r--r--app-emacs/windows/metadata.xml9
-rw-r--r--app-emacs/windows/windows-2.49.ebuild25
-rw-r--r--app-emacs/with-editor-2.6.012
-rw-r--r--app-emacs/with-editor-2.7.212
-rw-r--r--app-emacs/with-editor-2.7.312
-rw-r--r--app-emacs/with-editor/Manifest8
-rw-r--r--app-emacs/with-editor/files/50with-editor-gentoo.el1
-rw-r--r--app-emacs/with-editor/metadata.xml19
-rw-r--r--app-emacs/with-editor/with-editor-2.6.0.ebuild24
-rw-r--r--app-emacs/with-editor/with-editor-2.7.2.ebuild24
-rw-r--r--app-emacs/with-editor/with-editor-2.7.3.ebuild24
-rw-r--r--app-emacs/xclip-1.312
-rw-r--r--app-emacs/xclip/Manifest4
-rw-r--r--app-emacs/xclip/files/50xclip-gentoo.el3
-rw-r--r--app-emacs/xclip/metadata.xml9
-rw-r--r--app-emacs/xclip/xclip-1.3.ebuild19
-rw-r--r--app-emacs/xrdb-mode-3.012
-rw-r--r--app-emacs/xrdb-mode/Manifest4
-rw-r--r--app-emacs/xrdb-mode/files/50xrdb-mode-gentoo.el5
-rw-r--r--app-emacs/xrdb-mode/metadata.xml12
-rw-r--r--app-emacs/xrdb-mode/xrdb-mode-3.0.ebuild18
-rw-r--r--app-emacs/xslide-0.2.212
-rw-r--r--app-emacs/xslide/Manifest4
-rw-r--r--app-emacs/xslide/files/50xslide-gentoo.el7
-rw-r--r--app-emacs/xslide/metadata.xml12
-rw-r--r--app-emacs/xslide/xslide-0.2.2.ebuild25
-rw-r--r--app-emacs/yaml-mode-0.0.1312
-rw-r--r--app-emacs/yaml-mode-0.0.912
-rw-r--r--app-emacs/yaml-mode/Manifest6
-rw-r--r--app-emacs/yaml-mode/files/50yaml-mode-gentoo.el3
-rw-r--r--app-emacs/yaml-mode/metadata.xml12
-rw-r--r--app-emacs/yaml-mode/yaml-mode-0.0.13.ebuild18
-rw-r--r--app-emacs/yaml-mode/yaml-mode-0.0.9.ebuild18
-rw-r--r--app-emacs/yasnippet-0.13.013
-rw-r--r--app-emacs/yasnippet-snippets-0.312
-rw-r--r--app-emacs/yasnippet-snippets/Manifest4
-rw-r--r--app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el4
-rw-r--r--app-emacs/yasnippet-snippets/metadata.xml12
-rw-r--r--app-emacs/yasnippet-snippets/yasnippet-snippets-0.3.ebuild27
-rw-r--r--app-emacs/yasnippet/Manifest4
-rw-r--r--app-emacs/yasnippet/files/50yasnippet-gentoo-0.13.0.el4
-rw-r--r--app-emacs/yasnippet/metadata.xml16
-rw-r--r--app-emacs/yasnippet/yasnippet-0.13.0.ebuild36
-rw-r--r--app-emacs/yatex-1.7613
-rw-r--r--app-emacs/yatex-1.7713
-rw-r--r--app-emacs/yatex/Manifest9
-rw-r--r--app-emacs/yatex/files/50yatex-gentoo.el15
-rw-r--r--app-emacs/yatex/files/yatex-1.76-direntry.patch60
-rw-r--r--app-emacs/yatex/files/yatex-1.76-gentoo.patch16
-rw-r--r--app-emacs/yatex/files/yatex-1.77-texinfo-5.patch86
-rw-r--r--app-emacs/yatex/metadata.xml20
-rw-r--r--app-emacs/yatex/yatex-1.76.ebuild50
-rw-r--r--app-emacs/yatex/yatex-1.77.ebuild51
-rw-r--r--app-emacs/yc-4.0.1312
-rw-r--r--app-emacs/yc-5.2.112
-rw-r--r--app-emacs/yc/Manifest9
-rw-r--r--app-emacs/yc/files/50yc-gentoo.el1
-rw-r--r--app-emacs/yc/files/sample.dot.emacs12
-rw-r--r--app-emacs/yc/files/sample.hosts.canna2
-rw-r--r--app-emacs/yc/files/yc-5.2.1-emacs-26.patch11
-rw-r--r--app-emacs/yc/metadata.xml12
-rw-r--r--app-emacs/yc/yc-4.0.13.ebuild53
-rw-r--r--app-emacs/yc/yc-5.2.1.ebuild43
-rw-r--r--app-emacs/zenburn-2011090712
-rw-r--r--app-emacs/zenburn/Manifest4
-rw-r--r--app-emacs/zenburn/files/50zenburn-gentoo.el4
-rw-r--r--app-emacs/zenburn/metadata.xml16
-rw-r--r--app-emacs/zenburn/zenburn-20110907.ebuild28
-rw-r--r--app-emacs/zenirc-2.112-r112
-rw-r--r--app-emacs/zenirc/Manifest4
-rw-r--r--app-emacs/zenirc/files/50zenirc-gentoo.el2
-rw-r--r--app-emacs/zenirc/metadata.xml19
-rw-r--r--app-emacs/zenirc/zenirc-2.112-r1.ebuild42
1266 files changed, 16871 insertions, 3504 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 63356cd5de03..37a260b64d5a 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
Binary files differ
diff --git a/app-emacs/actionscript-mode-7.2.2_p20120405 b/app-emacs/actionscript-mode-7.2.2_p20120405
deleted file mode 100644
index 1b60f6504b41..000000000000
--- a/app-emacs/actionscript-mode-7.2.2_p20120405
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A major mode for GNU Emacs for editing Actionscript 3 files
-EAPI=4
-HOMEPAGE=https://github.com/austinhaas/actionscript-mode
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/austinhaas/actionscript-mode/tarball/aa7e63d566a815152e7e652010becd46a406abb2 -> actionscript-mode-7.2.2_p20120405.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=e0966953bb0ee16ca2ffabe326c95be6
diff --git a/app-emacs/actionscript-mode-7.2.2_p20140605 b/app-emacs/actionscript-mode-7.2.2_p20140605
deleted file mode 100644
index 968d90a19cd2..000000000000
--- a/app-emacs/actionscript-mode-7.2.2_p20140605
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A major mode for GNU Emacs for editing Actionscript 3 files
-EAPI=5
-HOMEPAGE=https://github.com/austinhaas/actionscript-mode
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/austinhaas/actionscript-mode/tarball/6822d0bfd5d7ff2c0b246ca90ef9480d3c528b97 -> actionscript-mode-7.2.2_p20140605.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=1e56fa6b1ff705b3bad634000b928d55
diff --git a/app-emacs/actionscript-mode/Manifest b/app-emacs/actionscript-mode/Manifest
new file mode 100644
index 000000000000..10a0686f747f
--- /dev/null
+++ b/app-emacs/actionscript-mode/Manifest
@@ -0,0 +1,6 @@
+AUX 50actionscript-mode-gentoo.el 270 BLAKE2B e3ad9140ed1c92d78fdd3aa60855bacce78f798c8cecfcab158c04340da231bc5a0338fa3d8bd111d1770527a9b00bbeb123e50f4e71d7e9e673f70aaeb41462 SHA512 0e991f231e57ff72f992670f6469f36409fc89243afc5d6955b9035fa835cd4af2b107d59031a692c07c3d66b3e6e82941659619e344fef5a5b3b4c423437a3e
+DIST actionscript-mode-7.2.2_p20120405.tar.gz 8226 BLAKE2B e8f33f3320b4b0891b244963fea282e16d50cb256fe4439a2f26bc2640607d5f530b537392248832f695d9f4ac5b89f6a8e0f17ae6941aa4ce58b0ba1c028e1b SHA512 79f59b5c6e53d8b7b5a765579629e956a90adadac65c8a46be883cb22813a15437cc63a0ec1a5c9b44e2034284f5d7c4405bbf3670861186f7a85af0a1e720fb
+DIST actionscript-mode-7.2.2_p20140605.tar.gz 8276 BLAKE2B 8fbe8147b1626f4e454753ae92baf14020424c0806aee4a9e050b789770e7bd1f19f45b0d493fd94af0d05ce541916c0dec1bad2327b285de77e8d27a7a1e675 SHA512 05a3a0a0bc185bdbc96bf292a220912e8649acd20eb3f55dbfde04cd956da3e4f71daa10957bb2ba6e150589f626ec1059908e3b294a643b4034a6c08e507fb8
+EBUILD actionscript-mode-7.2.2_p20120405.ebuild 648 BLAKE2B 7d836606f7f7f3c7add965ea9bd4377c6b4bef01258dd77b49ca5344cd935b4ec253568eb21221e42046c33ff8360e0f4c8f2535d2b105d90aceb512347b872b SHA512 d7ec42df1ab94d55f844491545f2ba533392c3b5e9d67d703a9f60ab9dc6fcae94cca26265590836b9387016d64fd38df09dd450c1485fd792c03ce0365609e6
+EBUILD actionscript-mode-7.2.2_p20140605.ebuild 648 BLAKE2B d4cc2e0ecdbde972bc6dd47103be11ba74acbe2d52e93509818b37832b8fa4bc34c88df4882e85dfa2986d56724e6474f100d47b0a4ae33ab6b322171e3f768a SHA512 4375a370c110599c159aec9eab45e7d0ead0272b52a800e320d13a05592749ea241790cf57e33069208dc7a39f92f1d4484559c0a236ad13229771a78c0586bc
+MISC metadata.xml 373 BLAKE2B 459d26d032a23887848eca1b521e609ba0799b2b85ee625b4ab6918562c55e0513fd4946caac21b0736d2f65648d30630c7b12f5b74f7b8f191f6d429f1b34f7 SHA512 3459389fdaaec6cf0126421ed50e0e3b06262771233808b5e3f1563ae2216e32f294396336fcf55b9807f1e2418cd17291e10ffad9d23436a19662b7e23d634e
diff --git a/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20120405.ebuild b/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20120405.ebuild
new file mode 100644
index 000000000000..bcfe47642bf7
--- /dev/null
+++ b/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20120405.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+GITHUB_USER="austinhaas"
+GITHUB_PROJECT="${PN}"
+GITHUB_TAG="aa7e63d566a815152e7e652010becd46a406abb2"
+
+DESCRIPTION="A major mode for GNU Emacs for editing Actionscript 3 files"
+HOMEPAGE="https://github.com/austinhaas/actionscript-mode"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/${GITHUB_TAG} -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS="README.txt"
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+ unpack ${A}
+ mv "${GITHUB_USER}-${GITHUB_PROJECT}"-* ${P} || die
+}
diff --git a/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20140605.ebuild b/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20140605.ebuild
new file mode 100644
index 000000000000..a9168a442eb4
--- /dev/null
+++ b/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20140605.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+GITHUB_USER="austinhaas"
+GITHUB_PROJECT="${PN}"
+GITHUB_TAG="6822d0bfd5d7ff2c0b246ca90ef9480d3c528b97"
+
+DESCRIPTION="A major mode for GNU Emacs for editing Actionscript 3 files"
+HOMEPAGE="https://github.com/austinhaas/actionscript-mode"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/${GITHUB_TAG} -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS="README.txt"
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+ unpack ${A}
+ mv "${GITHUB_USER}-${GITHUB_PROJECT}"-* ${P} || die
+}
diff --git a/app-emacs/actionscript-mode/files/50actionscript-mode-gentoo.el b/app-emacs/actionscript-mode/files/50actionscript-mode-gentoo.el
new file mode 100644
index 000000000000..7b6ca265923d
--- /dev/null
+++ b/app-emacs/actionscript-mode/files/50actionscript-mode-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'actionscript-mode "actionscript-mode"
+ "Major mode for editing Actionscript files." t)
+(add-to-list 'auto-mode-alist '("\\.as\\'" . actionscript-mode))
+(eval-after-load "actionscript-mode" '(load "actionscript-config"))
diff --git a/app-emacs/actionscript-mode/metadata.xml b/app-emacs/actionscript-mode/metadata.xml
new file mode 100644
index 000000000000..f297a7b7223b
--- /dev/null
+++ b/app-emacs/actionscript-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">austinhaas/actionscript-mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/adaptive-wrap-0.5 b/app-emacs/adaptive-wrap-0.5
deleted file mode 100644
index 49ef5ce6fa1a..000000000000
--- a/app-emacs/adaptive-wrap-0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Smart line-wrapping with wrap-prefix
-EAPI=6
-HOMEPAGE=https://elpa.gnu.org/packages/adaptive-wrap.html
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://elpa.gnu.org/packages/adaptive-wrap-0.5.el
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=83e875035ffad89385a03e77ac48ed82
diff --git a/app-emacs/adaptive-wrap/Manifest b/app-emacs/adaptive-wrap/Manifest
new file mode 100644
index 000000000000..25a5b9113143
--- /dev/null
+++ b/app-emacs/adaptive-wrap/Manifest
@@ -0,0 +1,4 @@
+AUX 50adaptive-wrap-gentoo.el 147 BLAKE2B 44b986f51ec3254d0fb79554296427343cc5c0e462d2baf54c99cacc1b9a45a7c6f52b96ec7957c90b8f021bfcb2fd5d7e3810f7b9c9df8124d78b0202f9d8d1 SHA512 869d6dc360d57348aeea5de6e096a2c44363f35b84119546a8d63d6d776cf0a344156b93a4c8d14d05fa6ea3c430a2ab7f0640370ee3d04fe26d0ee845ce3ff7
+DIST adaptive-wrap-0.5.el 6111 BLAKE2B 72813abcbe674a9e15dc72d189a1b2a0cf6ca490ad5f96daaba94feac832b10ca0c6fde364e8ea34ddcd8f1b170e331cb31f3be2844d72e1c039dbefa3069451 SHA512 0ffc52ad4343b57376dfb1ef09c7cc31d5933568ed614afc7d6d104fcb2ddf1eb69a69d4b04f5f97b726cc66ddacfc8d56ff10e447cf24f45227ee568adbcb95
+EBUILD adaptive-wrap-0.5.ebuild 439 BLAKE2B a949c25bcf1b8bc5324b0d6645173d798485766d00bdc9b71a74388d01ac4c5c59ef97003c62150746a50196f94603c0446bcccf455a77bcd40f929c02d2b746 SHA512 49fbac464ebdbf93e4883ac3252d5b96216b7e163c485edccb715218605e5e8b4fe3d662657b94ca52bbf816b33b8615762aee8c8dd57f91273fbc0bcb939fd9
+MISC metadata.xml 292 BLAKE2B 046265ce3ff94f04bba9b4b344d852203657df8dd300f30620df260bad1c56b3c23a8c48d073f70f571f733af9a7c034922e0465878028ee8f748060a6816ec6 SHA512 f0115ae686d3003f4264968d3aeb0b054830f87f35378e15e205a729d591c8697507d3c76ead9e1f0bab1f1f66a3fda108322dbcec7b857a37000511d1dd17df
diff --git a/app-emacs/adaptive-wrap/adaptive-wrap-0.5.ebuild b/app-emacs/adaptive-wrap/adaptive-wrap-0.5.ebuild
new file mode 100644
index 000000000000..b009cb85e616
--- /dev/null
+++ b/app-emacs/adaptive-wrap/adaptive-wrap-0.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Smart line-wrapping with wrap-prefix"
+HOMEPAGE="https://elpa.gnu.org/packages/adaptive-wrap.html"
+SRC_URI="https://elpa.gnu.org/packages/${P}.el"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+ cp "${DISTDIR}"/${P}.el ${PN}.el || die
+}
diff --git a/app-emacs/adaptive-wrap/files/50adaptive-wrap-gentoo.el b/app-emacs/adaptive-wrap/files/50adaptive-wrap-gentoo.el
new file mode 100644
index 000000000000..3609fffb6421
--- /dev/null
+++ b/app-emacs/adaptive-wrap/files/50adaptive-wrap-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'adaptive-wrap-prefix-mode "adaptive-wrap"
+ "Wrap the buffer text with adaptive filling." t nil)
diff --git a/app-emacs/adaptive-wrap/metadata.xml b/app-emacs/adaptive-wrap/metadata.xml
new file mode 100644
index 000000000000..c6a53b949e75
--- /dev/null
+++ b/app-emacs/adaptive-wrap/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/analog-1.9.99 b/app-emacs/analog-1.9.99
deleted file mode 100644
index cd999c32eae1..000000000000
--- a/app-emacs/analog-1.9.99
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Monitor lists of files or command output
-EAPI=4
-HOMEPAGE=http://mph-emacs-pkgs.alioth.debian.org/AnalogEl.html
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/analog-1.9.99.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=75f704bb9b2d72766e7d87f624b783d6
diff --git a/app-emacs/analog/Manifest b/app-emacs/analog/Manifest
new file mode 100644
index 000000000000..f06816fe07ba
--- /dev/null
+++ b/app-emacs/analog/Manifest
@@ -0,0 +1,4 @@
+AUX 50analog-gentoo.el 88 BLAKE2B 980fb76a8230eb768cc675d46bed630afb1e9a62301f9d47b963f00b0e3b4dee60cf497ee68a9044f48abcf7bf6d23b69eb434961e320232ffda8854c1fedf6c SHA512 a74fbc95f45893507aa84dcb6e10f5e41fc65678ceaba2f1370ca75319a9f3287c9476bc453df9ff4545a976574770dcb1ba906536a8f090aa0a273f2bb7d6dd
+DIST analog-1.9.99.el.bz2 9626 BLAKE2B e96802c075d078b4f8a951176b52457da4a6cc52d909a1ffa6dec32fce85036b38acadc1a667e0d93808abe5b3f3ae2f22be071950948da13712a864cd500233 SHA512 c4ce5dcce93805cf4cbcd3316f044485adaa36e6479956f2a87c8bb6a6c1522e46a60cb8ef5a4bb3fd6a60187c4ed6760f74afe870c7491ba5c3e760ae2d6cc0
+EBUILD analog-1.9.99.ebuild 379 BLAKE2B 487d46f29fe373c6f80a68dbd782159c6ba34075207e240ef4d2e47b714f115162ac0b0b3eef0c34733f6737a2b3c52313cb5e7d54681fe54e4e84924c16bc1a SHA512 0379a4d03f09fd7db408545177d063aed0d3da8ba515172c93fda0689088352f26704155052f77ee9e5bc31f15265dfe98ca510fb9f3594d6b736792425eabf7
+MISC metadata.xml 600 BLAKE2B ec65a935c59d940ce6afeb1139aef9dd94ee0528f3d80aecc6fd228afbc9f8db179fc74e51e56bf5481021243ef274821ecb8a7e1389039658aed574c28736f0 SHA512 a4d9c8051340ef0440b989cec1fb43aeaa9bed9fd09d8d5d8d24c7e5d830e76603aee816d984ebf4d7a54517604e74189a97204b855745925852719537ac174a
diff --git a/app-emacs/analog/analog-1.9.99.ebuild b/app-emacs/analog/analog-1.9.99.ebuild
new file mode 100644
index 000000000000..b4aa33cca786
--- /dev/null
+++ b/app-emacs/analog/analog-1.9.99.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Monitor lists of files or command output"
+HOMEPAGE="http://mph-emacs-pkgs.alioth.debian.org/AnalogEl.html"
+SRC_URI="mirror://gentoo/${P}.el.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/analog/files/50analog-gentoo.el b/app-emacs/analog/files/50analog-gentoo.el
new file mode 100644
index 000000000000..8dbac8378c82
--- /dev/null
+++ b/app-emacs/analog/files/50analog-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'analog "analog" "Start analog mode" t)
diff --git a/app-emacs/analog/metadata.xml b/app-emacs/analog/metadata.xml
new file mode 100644
index 000000000000..69e94cc25b35
--- /dev/null
+++ b/app-emacs/analog/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ Emacs mode to monitor lists of files or command output.
+
+ Features:
+ * Monitor files or the output from commands.
+ * Filter or highlight using regular expressions (regexps).
+ * Collect entries into groups.
+ * Easily visit files or view the complete output for commands.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/anything-1.3.2 b/app-emacs/anything-1.3.2
deleted file mode 100644
index 7981ff4b178e..000000000000
--- a/app-emacs/anything-1.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Open anything - QuickSilver-like candidate-selection framework
-EAPI=4
-HOMEPAGE=https://www.emacswiki.org/emacs/Anything
-IUSE=extensions
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/anything-1.3.2.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=16b48a21ba6876fa9133a53659d04ca3
diff --git a/app-emacs/anything/Manifest b/app-emacs/anything/Manifest
new file mode 100644
index 000000000000..319cb31ef37f
--- /dev/null
+++ b/app-emacs/anything/Manifest
@@ -0,0 +1,4 @@
+AUX 50anything-gentoo.el 83 BLAKE2B c0531502f573d32e225dffed81495270cd77d610992f8289c282f430d0d8494e9ca6b32c3a282c73a467917da03181bcf08f332c22091c8845b6e679d2a5945d SHA512 fefd4b2ea8f66201b439da4532c4c5e54c06efdfa2246c3e08006df467ba128237e950837018412e83e8a9a589b7f51f9791bcec3a62bce2c54ac83188b5525c
+DIST anything-1.3.2.tar.gz 2165646 BLAKE2B a61e48538d550d55c841c9a788dac5b4f80ba7ad61950245234a1a08b8a8ed6fd4ec8c7f85f448d66acfc579217e02126b9542ad1685b6bd7534a0deb92bf3cf SHA512 aeeecb6ab9991e3b230005e0f7328cc436b0a3508001c18d46137b8bb6e1883308d2e0af25a57e92a8b980fa119fd7eb094d3f4abacc3f0b9a0a9c409b623960
+EBUILD anything-1.3.2.ebuild 894 BLAKE2B 8b9627a19f8dcf38643d8b627a16b227f987532eff40e8e5c8025d9383581c9fb43c0369f938b7abbac0617f20df1aa7a219268260d75d91acf2336e8b69f387 SHA512 c01eefaa160c61ceb35896fe8349a2d44bc35363e0ad61913fe365a5c1ba518a5626b90a42e8816052fd8a6400489ba69a036a7a144dd3149ea1942b4e90d573
+MISC metadata.xml 356 BLAKE2B 8902d893ea3b17c421e40edc3ee20df43a103332b14dd63a1883d40ccf842e3cc2f3d53cf7f2dfdb2a48785ae5e9ad69dc8ed38a76a63417e1936ca1efff316b SHA512 4d5e7576d8f7998edd8d9e2de01feb270c263a6bdd97aaae08353914a93cf010106933a163c1b233479e3b1173befb27a1870b26e37979b240645d7467718e14
diff --git a/app-emacs/anything/anything-1.3.2.ebuild b/app-emacs/anything/anything-1.3.2.ebuild
new file mode 100644
index 000000000000..6afe9363a764
--- /dev/null
+++ b/app-emacs/anything/anything-1.3.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Open anything - QuickSilver-like candidate-selection framework"
+HOMEPAGE="https://www.emacswiki.org/emacs/Anything"
+# snapshot from http://repo.or.cz/w/anything-config.git
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="extensions"
+
+S="${WORKDIR}/anything-config"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile *.el || die
+ elisp-make-autoload-file || die
+
+ if use extensions; then
+ BYTECOMPFLAGS="-L . -L extensions" elisp-compile extensions/*.el || die
+ fi
+}
+
+src_install() {
+ elisp-install ${PN} *.{el,elc} || die
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+ if use extensions; then
+ elisp-install ${PN} extensions/*.{el,elc} || die
+ fi
+
+ dodoc README doc/anything.pdf
+}
diff --git a/app-emacs/anything/files/50anything-gentoo.el b/app-emacs/anything/files/50anything-gentoo.el
new file mode 100644
index 000000000000..5ae22f3a672b
--- /dev/null
+++ b/app-emacs/anything/files/50anything-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "@SITELISP@/anything-autoloads" nil t)
diff --git a/app-emacs/anything/metadata.xml b/app-emacs/anything/metadata.xml
new file mode 100644
index 000000000000..814adf324742
--- /dev/null
+++ b/app-emacs/anything/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<use>
+ <flag name="extensions">Install optional extensions</flag>
+</use>
+</pkgmetadata>
diff --git a/app-emacs/apache-mode-1.1 b/app-emacs/apache-mode-1.1
deleted file mode 100644
index d62c403d796b..000000000000
--- a/app-emacs/apache-mode-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Major mode for editing Apache configuration files
-EAPI=4
-HOMEPAGE=http://www.keelhaul.me.uk/linux/#apachemode
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/apache-mode-1.1.el.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=ab97577be0a372ee3bc4f90f14faa3f1
diff --git a/app-emacs/apache-mode/Manifest b/app-emacs/apache-mode/Manifest
new file mode 100644
index 000000000000..f696b615405d
--- /dev/null
+++ b/app-emacs/apache-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50apache-mode-gentoo.el 499 BLAKE2B a49be09cf0a7ef07263899bcd1ba7485228cec4932bb7e756d2f31fecc63299389b68e9c3d6e08b2664b0e4d187f92550fe785bcd3d8b241b7a8a1bb3b707128 SHA512 4193ed796f1bd433ad33f61e2d23eafb6cde2114304f51c20464827d25185408749eccadb006663be25bb3a62b206deedf654bf0398b3e5ef94773a53ba28caf
+DIST apache-mode-1.1.el.gz 3468 BLAKE2B aa89b18877049fa8399ef75dd048e40eb84c20dec4365b08bcb1d1df2a14e4a2d63a2baff3bfeed1bb01fdd0489a757b3377ad21d311c03e958650e68a0f927b SHA512 4eb42a0b4db847026832f14473dfc6cfea6c436eaed5a52c2ca3ba27cc89b0b36b0e7be1472048e1c559f3b5d5a5e7e85b9e2cb9c5563bf781f241b540e141f1
+EBUILD apache-mode-1.1.ebuild 377 BLAKE2B 8818e51c9504cb143b83046ec9c33b085dfcb24e714e63138127c54f83de31b73c4161144a1b2304508832857fc97b038ed6226f0e23e1c9cde55c8c0e576501 SHA512 ae7e50866fff671b94acd287b8671ec77e5ffecc093c6f685afdb3be1e48f3178f2f4ac5d832e37897add19a2fa14e062a2899f01ec11e34f78fcbd3c7eed894
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/apache-mode/apache-mode-1.1.ebuild b/app-emacs/apache-mode/apache-mode-1.1.ebuild
new file mode 100644
index 000000000000..7fc337a8f516
--- /dev/null
+++ b/app-emacs/apache-mode/apache-mode-1.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Major mode for editing Apache configuration files"
+HOMEPAGE="http://www.keelhaul.me.uk/linux/#apachemode"
+SRC_URI="mirror://gentoo/${P}.el.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/apache-mode/files/50apache-mode-gentoo.el b/app-emacs/apache-mode/files/50apache-mode-gentoo.el
new file mode 100644
index 000000000000..c8ceb9f8c080
--- /dev/null
+++ b/app-emacs/apache-mode/files/50apache-mode-gentoo.el
@@ -0,0 +1,8 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'apache-mode "apache-mode" "autoloaded" t)
+(add-to-list 'auto-mode-alist '("\\.htaccess$" . apache-mode))
+(add-to-list 'auto-mode-alist '("httpd\\.conf$" . apache-mode))
+(add-to-list 'auto-mode-alist '("srm\\.conf$" . apache-mode))
+(add-to-list 'auto-mode-alist '("access\\.conf$" . apache-mode))
+(add-to-list 'auto-mode-alist '("apache[12]\?\\.conf$" . apache-mode))
+(add-to-list 'auto-mode-alist '("commonapache[12]\?\\.conf$" . apache-mode))
diff --git a/app-emacs/apache-mode/metadata.xml b/app-emacs/apache-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/apache-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/apel-10.8-r1 b/app-emacs/apel-10.8-r1
deleted file mode 100644
index 743f9865be56..000000000000
--- a/app-emacs/apel-10.8-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A Portable Emacs Library is a library for making portable Emacs Lisp programs
-EAPI=4
-HOMEPAGE=http://cvs.m17n.org/elisp/APEL/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=ftp://ftp.jpl.org/pub/elisp/apel/apel-10.8.tar.gz https://dev.gentoo.org/~gienah/2big4tree/app-emacs/apel/apel-10.8-030_Use-new-style-backquotes.patch.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=1ee795580f54ca9a62ec640a07224c92
diff --git a/app-emacs/apel/Manifest b/app-emacs/apel/Manifest
new file mode 100644
index 000000000000..31035d125333
--- /dev/null
+++ b/app-emacs/apel/Manifest
@@ -0,0 +1,8 @@
+AUX 50apel-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX apel-10.8-010_ikazuhiro.patch 6631 BLAKE2B 729f790c0c638a41a6cd040268544ce2246c3161a7bab43b875c469b678e6fc6600a88741a413fce42a67bc5db58a6db2abb83e7f2ef1db1456290e17362cef6 SHA512 1630c45bec06b019815f1989b2279ba1e85634b9358f65254af1e40fcf51c8426715afe9c014a73928bc4ec59f6b71db1ddffeeadb3499ebc4324571631fd82c
+AUX apel-10.8-020_Prevent-fontset-error.patch 755 BLAKE2B a5d6a5eb718d99c058c736dc66e50affd8a0c748aabdefbb068f210bfb259290573eb5551bb14d3f8dca5e4af4cea89e65af3ef9d1b42c19b80d38ccf623a35d SHA512 4617ec3e48758fb85fffc9d07eb657e00451abc6605b3e65db5d01c99f37824c4232913fd445f387bdbe024409e7b01030b3337fa00ea3f52fafa289ecf11da6
+AUX apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch 888 BLAKE2B 1e79046bec7fa199eb0c055ee1d3e56c33229f493f2739537bb61012034fce06dd3644315e66c324c716386187ab6b7e92f4f571e03c7c63471d683df27e1ae5 SHA512 50795dff5cdb86a3a778257cfea5894b682e3c74e6b8a0b963606eb0b125158927c499ece14af0da418b491a30f6bbced4d101cf5ee29e4fc110a604d729a778
+DIST apel-10.8-030_Use-new-style-backquotes.patch.gz 7869 BLAKE2B 93b93a089693a2fec68033b44f1cf96117fcdcb9dad5dbbf4283a79cd19f358c2a3bdc80ce2f7517e8b396182141583a371c21a8df7db7d05156ffd16987a872 SHA512 4074dc612feb2d63637bea2e9303423d4e9e035fad7f440d2da5331a6adc08f5ec61abb5087c2c4c72ec8931d1ccc4db3ffd061bcf3150d20c222c8df2e0b274
+DIST apel-10.8.tar.gz 126326 BLAKE2B 6fc8f04006a971e9d48dbf5f7b43e201a4f5fa515210bb69829bc3b0f05aba2e9f205915e6117e20220ae5b48a6543520533dc95a90754a30ff3fb8094779901 SHA512 39f13f15ec0a078d8f8dfe797899474cf4dfeb0bf7b8432a0c05bb38cf134d805c171a66b3d3efd074fbf294d68006d1e1d49903e45f1991d79cdcb4cca4aa9d
+EBUILD apel-10.8-r1.ebuild 1455 BLAKE2B a4d4bbad29a3acf63f69d20a6790ca49d0570cfae4736df11e8ce4529aa609bf810dcb814d634ff1a732595fe3deb313134fc8c276c1fe15464abe89e210f03e SHA512 8d61139612e6c74c113d690599675bf13fdf4fb3e8008bd26e38e7a8c4c9ebb21a05fc2f732149bd99337bdd40f59aaf347518a693c892eb4965bf1fca75ab92
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/apel/apel-10.8-r1.ebuild b/app-emacs/apel/apel-10.8-r1.ebuild
new file mode 100644
index 000000000000..7559be4d453d
--- /dev/null
+++ b/app-emacs/apel/apel-10.8-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="A Portable Emacs Library is a library for making portable Emacs Lisp programs"
+HOMEPAGE="http://cvs.m17n.org/elisp/APEL/"
+SRC_URI="ftp://ftp.jpl.org/pub/elisp/apel/${P}.tar.gz
+ https://dev.gentoo.org/~gienah/2big4tree/app-emacs/${PN}/${PN}-10.8-030_Use-new-style-backquotes.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+ELISP_PATCHES="${PN}-10.8-020_Prevent-fontset-error.patch
+ ${PN}-10.8-030_Use-new-style-backquotes.patch
+ ${PN}-10.8-010_ikazuhiro.patch
+ ${PN}-10.8-040_make-temp-file-for-Emacs-24.3.50.patch"
+
+src_prepare() {
+ elisp_src_prepare
+ cat <<-EOF >> APEL-CFG
+ (setq APEL_PREFIX "apel")
+ (setq EMU_PREFIX "apel")
+ EOF
+}
+
+src_compile() {
+ emake PREFIX="${ED}/usr" \
+ LISPDIR="${ED}/${SITELISP}" \
+ VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}"
+}
+
+src_install() {
+ emake PREFIX="${ED}/usr" \
+ LISPDIR="${ED}/${SITELISP}" \
+ VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" \
+ install
+ elisp-site-file-install "${FILESDIR}/50apel-gentoo.el"
+ dodoc ChangeLog README*
+}
+
+pkg_postinst() {
+ elisp-site-regen
+ elog "See the README.en file in /usr/share/doc/${PF} for tips"
+ elog "on how to customize this package."
+ elog "And you need to rebuild packages depending on ${PN}."
+}
diff --git a/app-emacs/apel/files/50apel-gentoo.el b/app-emacs/apel/files/50apel-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/apel/files/50apel-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/apel/files/apel-10.8-010_ikazuhiro.patch b/app-emacs/apel/files/apel-10.8-010_ikazuhiro.patch
new file mode 100644
index 000000000000..558939dee9fc
--- /dev/null
+++ b/app-emacs/apel/files/apel-10.8-010_ikazuhiro.patch
@@ -0,0 +1,189 @@
+--- apel-10.8-orig/ChangeLog 2013-10-03 18:17:05.176741628 +1000
++++ apel-10.8/ChangeLog 2013-10-03 18:16:54.442741731 +1000
+@@ -1,3 +1,56 @@
++2013-07-05 Tatsuya Kinoshita <tats@vega.ocn.ne.jp>
++
++ * mcs-20.el: Really check whether the mule-vesion variable is defined.
++
++2013-07-04 Kazuhiro Ito <kzhr@d1.dion.ne.jp>
++
++ * mcs-20.el: Check whether the mule-vesion variable is defined.
++ Cf. https://github.com/ikazuhiro/apel/commit/328c02e022340b36dd7e5f9250c7f86d2bafd793
++
++2013-03-24 Kazuhiro Ito <kzhr@d1.dion.ne.jp>
++
++ * mcs-20.el (mime-charset-to-coding-system): Display the message
++ and use charset name as coding system when
++ `mime-charset-coding-system-alist' indicates invalid coding
++ system.
++
++2012-09-07 Kazuhiro Ito <kzhr@d1.dion.ne.jp>
++
++ * mcs-e20.el (coding-system-to-mime-charset): Coding system's
++ setting is preferred to mime-charset-coding-system-alist's value.
++ Detect MIME name from mime-charset-coding-system-alist's value
++ more permissively.
++
++2012-08-08 Kazuhiro Ito <kzhr@d1.dion.ne.jp>
++
++ * poe.el (next-command-event): Fix that Emacs 21 and later were
++ treated as 'Emacs 19, 20.1 and 20.2'.
++
++2012-07-28 Kazuhiro Ito <kzhr@d1.dion.ne.jp>
++
++ * mcs-e20.el (charsets-mime-charset-alist): Do not use
++ `iso-2022-jp-2'.
++
++2012-07-28 Kazuhiro Ito <kzhr@d1.dion.ne.jp>
++
++ * mcs-20.el (detect-mime-charset-string): (Emacs23 and later) New
++ function.
++ (detect-mime-charset-region): Use it.
++
++2011-06-17 Kazuhiro Ito <kzhr@d1.dion.ne.jp>
++
++ * mcs-20.el (detect-mime-charset-region): (Emacs23 and later) Do
++ not check whether `charsets-mime-charset-alist' contains non
++ charset symbol.
++
++ * mcs-e20.el (charsets-mime-charset-alist): Remove non charset
++ symbol for Emacs 23 and later.
++
++2010-03-19 Kazuhiro Ito <kzhr@d1.dion.ne.jp>
++
++ * mcs-20.el (detect-mime-charset-region): Do not care priority of
++ charsets on Emacs 23 and later.
++
+ 2011-07-17 David Maus <dmaus@ictsoc.de>
+
+ * tinycustom.el (defcustom): Use new style backquotes.
+--- apel-10.8-orig/mcs-20.el 2005-07-06 12:08:52.000000000 +1000
++++ apel-10.8/mcs-20.el 2013-10-03 17:44:42.936760151 +1000
+@@ -84,11 +84,13 @@
+ (if (stringp charset)
+ (setq charset (intern (downcase charset)))
+ )
+- (let ((cs (assq charset mime-charset-coding-system-alist)))
+- (setq cs
+- (if cs
+- (cdr cs)
+- charset))
++ (let ((cs (cdr (assq charset mime-charset-coding-system-alist))))
++ (unless (or (null cs) (find-coding-system cs))
++ (message
++ "Invalid coding system: %s. Confirm mime-charset-coding-system-alist."
++ cs)
++ (setq cs nil))
++ (unless cs (setq cs charset))
+ (if lbt
+ (setq cs (intern (format "%s-%s" cs
+ (cond ((eq lbt 'CRLF) 'dos)
+@@ -96,12 +98,11 @@
+ ((eq lbt 'CR) 'mac)
+ (t lbt)))))
+ )
+- (if (find-coding-system cs)
+- cs
+- (if mime-charset-to-coding-system-default-method
+- (funcall mime-charset-to-coding-system-default-method
+- charset lbt cs)
+- ))))
++ (or (find-coding-system cs)
++ (if mime-charset-to-coding-system-default-method
++ (funcall mime-charset-to-coding-system-default-method
++ charset lbt cs)
++ ))))
+
+ (defalias 'mime-charset-p 'mime-charset-to-coding-system)
+
+@@ -209,6 +210,34 @@
+ (setq rest (cdr rest)))
+ default-mime-charset-for-write)))
+ )
++
++((eval-when-compile (and (boundp 'mule-version)
++ (null (string< mule-version "6.0"))))
++;; for Emacs 23 and later
++(defun detect-mime-charset-string (string)
++ "Return MIME charset for STRING."
++ (let ((src (string-to-list string))
++ tmp)
++ (setq tmp src)
++ ;; Uniquify the list of characters.
++ (while tmp
++ (setq tmp (setcdr tmp (delq (car tmp) (cdr tmp)))))
++ ;; Detect charset from the list of characters.
++ (catch 'found
++ (mapc (lambda (cons)
++ (catch 'next
++ (mapc (lambda (ch) (unless (char-charset ch (car cons))
++ (throw 'next nil)))
++ src)
++ (throw 'found (cdr cons))))
++ charsets-mime-charset-alist)
++ default-mime-charset-for-write)))
++
++(defsubst detect-mime-charset-region (start end)
++ "Return MIME charset for region between START and END."
++ (detect-mime-charset-string
++ (buffer-substring-no-properties start end))))
++
+ (t
+ ;; for legacy Mule
+ (defun detect-mime-charset-region (start end)
+--- apel-10.8-orig/mcs-e20.el 2005-07-06 12:08:52.000000000 +1000
++++ apel-10.8/mcs-e20.el 2013-10-03 17:44:42.936760151 +1000
+@@ -90,11 +90,15 @@
+ ((ascii korean-ksc5601) . euc-kr)
+ ((ascii chinese-gb2312) . gb2312)
+ ((ascii chinese-big5-1 chinese-big5-2) . big5)
+- ((ascii thai-tis620 composition) . tis-620)
+- ((ascii latin-iso8859-1 greek-iso8859-7
+- latin-jisx0201 japanese-jisx0208-1978
+- chinese-gb2312 japanese-jisx0208
+- korean-ksc5601 japanese-jisx0212) . iso-2022-jp-2)
++ ,(static-cond
++ ((null (string< mule-version "6.0"))
++ '((ascii thai-tis620) . tis-620))
++ (t
++ '((ascii thai-tis620 composition) . tis-620)))
++ ;; ((ascii latin-iso8859-1 greek-iso8859-7
++ ;; latin-jisx0201 japanese-jisx0208-1978
++ ;; chinese-gb2312 japanese-jisx0208
++ ;; korean-ksc5601 japanese-jisx0212) . iso-2022-jp-2)
+ ;;((ascii latin-iso8859-1 greek-iso8859-7
+ ;; latin-jisx0201 japanese-jisx0208-1978
+ ;; chinese-gb2312 japanese-jisx0208
+@@ -119,8 +123,16 @@
+ (defun coding-system-to-mime-charset (coding-system)
+ "Convert CODING-SYSTEM to a MIME-charset.
+ Return nil if corresponding MIME-charset is not found."
+- (or (car (rassq coding-system mime-charset-coding-system-alist))
+- (coding-system-get coding-system 'mime-charset)
++ (or (coding-system-get coding-system 'mime-charset)
++ (let ((coding (coding-system-base coding-system))
++ (alist mime-charset-coding-system-alist)
++ result)
++ (while alist
++ (if (eq (coding-system-base (cdar alist)) coding)
++ (setq result (caar alist)
++ alist nil)
++ (setq alist (cdr alist))))
++ result)
+ ))
+
+ (defun-maybe-cond mime-charset-list ()
+--- apel-10.8-orig/poe.el 2013-10-03 17:43:11.327761025 +1000
++++ apel-10.8/poe.el 2013-10-03 17:44:42.937760151 +1000
+@@ -1996,8 +1996,9 @@
+ returned.
+ If PROMPT is non-nil, it should be a string and will be displayed in
+ the echo area while this function is waiting for an event."
+- ((and (>= emacs-major-version 20)
+- (>= emacs-minor-version 4))
++ ((or (>= emacs-major-version 21)
++ (and (>= emacs-major-version 20)
++ (>= emacs-minor-version 4)))
+ ;; Emacs 20.4 and later.
+ (read-event prompt)) ; should specify 2nd arg?
+ ((and (= emacs-major-version 20)
diff --git a/app-emacs/apel/files/apel-10.8-020_Prevent-fontset-error.patch b/app-emacs/apel/files/apel-10.8-020_Prevent-fontset-error.patch
new file mode 100644
index 000000000000..9cea1e675276
--- /dev/null
+++ b/app-emacs/apel/files/apel-10.8-020_Prevent-fontset-error.patch
@@ -0,0 +1,32 @@
+Description: Prevent an error of fontset-pixel-size for Emacs 23.
+Bug-Debian: http://bugs.debian.org/477177
+Author: Tatsuya Kinoshita <tats@debian.org>
+
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -0,0 +1,5 @@
++2010-02-14 Tatsuya Kinoshita <tats@vega.ocn.ne.jp>
++
++ * poem-e20.el (fontset-pixel-size): Don't cause an error. Workaround
++ for Emacs 23.
++
+--- a/poem-e20.el
++++ b/poem-e20.el
+@@ -25,6 +25,7 @@
+ ;;; Code:
+
+ (defun fontset-pixel-size (fontset)
++ (condition-case nil
+ (let* ((info (fontset-info fontset))
+ (height (aref info 1))
+ )
+@@ -32,7 +33,8 @@
+ ((string-match "-\\([0-9]+\\)-" fontset)
+ (string-to-number
+ (substring fontset (match-beginning 1)(match-end 1))))
+- (t 0))))
++ (t 0)))
++ (error 0)))
+
+
+ ;;; @ character set
diff --git a/app-emacs/apel/files/apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch b/app-emacs/apel/files/apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch
new file mode 100644
index 000000000000..30b0abc8ef77
--- /dev/null
+++ b/app-emacs/apel/files/apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch
@@ -0,0 +1,27 @@
+Subject: Fix wrong type argument on Emacs 24.3.50 to check make-temp-file
+From: Tatsuya Kinoshita <tats@debian.org>
+Bug-Debian: http://bugs.debian.org/718765
+
+diff --git a/ChangeLog b/ChangeLog
+index 8e96224..9505b2e 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -0,0 +1,5 @@
++2013-08-05 Tatsuya Kinoshita <tats@vega.ocn.ne.jp>
++
++ * poe.el: Fix wrong type argument on Emacs 24.3.50 to check
++ `make-temp-file'.
++
+diff --git a/poe.el b/poe.el
+index be52847..b381f90 100644
+--- a/poe.el
++++ b/poe.el
+@@ -1667,7 +1667,7 @@ See `walk-windows' for the meaning of MINIBUF and FRAME."
+ )))
+ ;; arglist: (prefix &optional dir-flag suffix)
+ (cond
+- ((not arglist)
++ ((or (not arglist) (not (listp arglist)))
+ ;; `make-temp-file' is a built-in; expects 3-args.
+ (put 'make-temp-file 'defun-maybe '3-args))
+ ((> (length arglist) 3)
diff --git a/app-emacs/apel/metadata.xml b/app-emacs/apel/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/apel/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/atomic-chrome-2.0.0 b/app-emacs/atomic-chrome-2.0.0
deleted file mode 100644
index b4a09360a4a2..000000000000
--- a/app-emacs/atomic-chrome-2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/websocket >=virtual/emacs-25
-DESCRIPTION=Edit text area on Chrome with Emacs using Atomic Chrome
-EAPI=6
-HOMEPAGE=https://github.com/alpha22jp/atomic-chrome
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-emacs/websocket >=virtual/emacs-25
-SLOT=0
-SRC_URI=https://github.com/alpha22jp/atomic-chrome/archive/v2.0.0.tar.gz -> atomic-chrome-2.0.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=05fb60580edb6036dc0dd7411f3e627c
diff --git a/app-emacs/atomic-chrome/Manifest b/app-emacs/atomic-chrome/Manifest
new file mode 100644
index 000000000000..2c9278f67f22
--- /dev/null
+++ b/app-emacs/atomic-chrome/Manifest
@@ -0,0 +1,4 @@
+AUX 50atomic-chrome-gentoo.el 242 BLAKE2B 9a9bbcb4c774ec38f8cbdf322e398ea7b95af3bd31e3e05bac3c928f6714bf995cb86f762831c080cffc28c6e9cbb6dbc1c59d366e700451f2190ef5bc65b0e2 SHA512 67c0f0159e9ab77adde7961cbcf2f87ab5297af472865dc0ea7a6cab5e5c9c1a4af10e40dada3fe2535b5e79248414423724dd3db13cbf7fae5b0ddc6f2a339d
+DIST atomic-chrome-2.0.0.tar.gz 218286 BLAKE2B db75055df1d337d6f5adfb1dcbef0f9976da38d50bcff96dd5e94993cca84c837d05432c27cab7b3b7bfc14c8a960d667e7c852eda4732f9209f8b72c9a3a191 SHA512 702c8e80246f47dd46f4c864412e47c7cb74a13737754ccf81053a5054b97c4f48c4ca7613d1734dbf7251fbcd1d15269e2a605c36b3e7b631613506bb3a49bc
+EBUILD atomic-chrome-2.0.0.ebuild 498 BLAKE2B 264aa0c308137b5fb93c80ff7cce87f27e58c4a41f5076a36a7cf85266070bd672f76290ae2d198147cefa045a7280550a4d43457fdd0499304ccfc01fc2f3fe SHA512 735fe443394c4a391f59cb9e0243a482d21cc394d5409ede37d466dece2d1b5ecd901836e7cb947c6eb9e2063d8dac0ef20f8b11d38ac7b7710c2f842579027a
+MISC metadata.xml 771 BLAKE2B d5f62dba0ee9e826601ce476015f846818ce3a4131310ce64e823b15a859b3e10fa7d34b1c904ec304e474c2ab818affb4726140e5dec72765aca88bf5993a2c SHA512 f073b3284ac6de2416fbdd822d6727c5844dc7a4b09475ebbbcc0435c719673150e0420204f9ee5fc7b4b58f272a1549f8c89a406fba4d00b8058bceaf657dfe
diff --git a/app-emacs/atomic-chrome/atomic-chrome-2.0.0.ebuild b/app-emacs/atomic-chrome/atomic-chrome-2.0.0.ebuild
new file mode 100644
index 000000000000..7bcf414202fa
--- /dev/null
+++ b/app-emacs/atomic-chrome/atomic-chrome-2.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=25
+
+inherit elisp
+
+DESCRIPTION="Edit text area on Chrome with Emacs using Atomic Chrome"
+HOMEPAGE="https://github.com/alpha22jp/atomic-chrome"
+SRC_URI="https://github.com/alpha22jp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-emacs/websocket"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emacs/atomic-chrome/files/50atomic-chrome-gentoo.el b/app-emacs/atomic-chrome/files/50atomic-chrome-gentoo.el
new file mode 100644
index 000000000000..82777a793c51
--- /dev/null
+++ b/app-emacs/atomic-chrome/files/50atomic-chrome-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'atomic-chrome-start-server "atomic-chrome"
+ "Start websocket server for atomic-chrome." t)
+(autoload 'atomic-chrome-stop-server "atomic-chrome"
+ "Stop websocket server for atomic-chrome." t)
diff --git a/app-emacs/atomic-chrome/metadata.xml b/app-emacs/atomic-chrome/metadata.xml
new file mode 100644
index 000000000000..b4c726410afd
--- /dev/null
+++ b/app-emacs/atomic-chrome/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ This is the Emacs version of Atomic Chrome which is an extension
+ for the Google Chrome browser that allows you to edit text areas
+ of the browser in Emacs. The input on Emacs is reflected to the
+ browser instantly and continuously. You can use both the browser
+ and Emacs at the same time. They are updated to the same content
+ bi-directionally.
+
+ Atomic Chrome for Emacs is also compatible with Firefox via the
+ GhostText browser extension.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/auctex-11.89 b/app-emacs/auctex-11.89
deleted file mode 100644
index b69b67f6a91a..000000000000
--- a/app-emacs/auctex-11.89
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23
-DESCRIPTION=Extensible package for writing and formatting TeX files in Emacs
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/auctex/
-IUSE=preview-latex
-KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-3+ FDL-1.3+
-RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gnu/auctex/auctex-11.89.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=1d5e5beef4e4f8cb34a69d02a4c5e0d7
diff --git a/app-emacs/auctex-11.90 b/app-emacs/auctex-11.90
deleted file mode 100644
index 68a9be8f4a7a..000000000000
--- a/app-emacs/auctex-11.90
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23
-DESCRIPTION=Extensible package for writing and formatting TeX files in Emacs
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/auctex/
-IUSE=preview-latex
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-3+ FDL-1.3+
-RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gnu/auctex/auctex-11.90.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=38fea10d9f5040b95d3435bc534fb7eb
diff --git a/app-emacs/auctex-11.92 b/app-emacs/auctex-11.92
deleted file mode 100644
index e18d668296d1..000000000000
--- a/app-emacs/auctex-11.92
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23
-DESCRIPTION=Extensible package for writing and formatting TeX files in Emacs
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/auctex/
-IUSE=preview-latex
-KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-3+ FDL-1.3+
-RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gnu/auctex/auctex-11.92.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=f323736e1d87895fef3529033cf7b879
diff --git a/app-emacs/auctex-12.1 b/app-emacs/auctex-12.1
deleted file mode 100644
index b4f5d286cf9d..000000000000
--- a/app-emacs/auctex-12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-24
-DESCRIPTION=Extensible package for writing and formatting TeX files in Emacs
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/auctex/
-IUSE=preview-latex
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-3+ FDL-1.3+
-RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-24
-SLOT=0
-SRC_URI=mirror://gnu/auctex/auctex-12.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=5242d1e86b687bce5e0b8278c8909eea
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
new file mode 100644
index 000000000000..661ca0739969
--- /dev/null
+++ b/app-emacs/auctex/Manifest
@@ -0,0 +1,11 @@
+AUX 50auctex-gentoo.el 157 BLAKE2B c7d59a1ff3fc08b60332f5f578841c942d1a302f9a594409b3cd6509fd254c0d8d4273061d2ec4f444ad9288b073900e4c07e9307ffe0421182e7380c4c73543 SHA512 7cfc10c95da1d920b3861eaa9950d5ddd2388af5086cb81457f084f9c094b15dae9638a8c1e9b662dedba90c2d3c33a972011b99d9e2d71d85f99003de5ebef2
+AUX 60auctex-gentoo.el 97 BLAKE2B 18cad086f4211844f8a32d0f2499d2ecf29cd41f90c9dee6cf87184f81b0ac3836a5a58705677b55f926bdeb5854aa9acd6438f42e29856acf6c6c644592e347 SHA512 2cf945ac36ad5b25afd723d04223556522ac901a469bdd47d0c7562beb985401df957acc100222df6d97f4335b6d3e8d003f6b00b86780eec0a906ff0fc2ccb4
+DIST auctex-11.89.tar.gz 1332904 BLAKE2B 1f89b9ee81d5cf5c896ce38731bb43978827452d607f7b61b995d55911bc36ca0071d0abadb293234e9c3f41bb8a57b92951e4eb0c3d7f13db063cb286920f37 SHA512 a78ddefb46c1eb271646f3c4e723f49a913e391eb58263df3d3de272bc1ad5b70c0a9de682f28124aa5a48b36c030b3e83425667ee1a1973a054ff03ef1d8be9
+DIST auctex-11.90.tar.gz 1437331 BLAKE2B 9f4c236132fcebb2c6996d3105e6e6d095e29e1ff531ad9d55c609b972a0a3cea0a580830c950ab6f59b0eda50625cc617e868c82a00705f41f472c08b13a7c3 SHA512 b90b246a6193570897102d8f95396b35c8b899fc594446f2455469b9c58ca8fd1dafbb852c6f167fd8500261f007c8a66531bb04582d7a5c4a50a15933b70c83
+DIST auctex-11.92.tar.gz 1486606 BLAKE2B 6e34d1da3bacad8f2baee2f13eb44a5b617a342c294ef4d7ba28059b678510e1d161f3f02fbcf38128c09ab4996a035e5ec28898134b967d88ad621b8b477845 SHA512 758bf82903ba0499decf0ade77c7ac70865132a24195d7e8794538b7857c448811b7ef26149a915b60ed3ee34c2ebaddb3282a320bd459c9ee3f461d6ee9b84e
+DIST auctex-12.1.tar.gz 1476296 BLAKE2B 1dd5db94b5b7bb572919fdcb6c7dd2ea4d17f816204bedc69756610b80370ca748a06ab100ef8221107605a5e464b6a8c2587b728ba6a964776ea6dfeb7f7165 SHA512 4c27a3b16eaf98db164832497c497576fcabb274b24c6eb3060625b7711b1de91fce9a52f7c7caaec77a93768a6ce2ec173ab1ccb72f4c56c51cc4740d380d97
+EBUILD auctex-11.89.ebuild 1500 BLAKE2B 36c458528ef61aa3d3b9817d50025637b5b0dd2ed4c03bb1934a9dde13b876471cfe101831998dc3415a2b71afde0ffcc002f92ca24a29632d289a6f5552b9d6 SHA512 7a33c524c93f4ed76e1a5727a0865aa6e936bac85310e3cedc37514396d776f62cc17b902a5d4dad1302b097ea60020114f6a6939b87068ca9ead6bd1ea0b066
+EBUILD auctex-11.90.ebuild 1505 BLAKE2B 1a78c6e82bdc63572129831b5688a48025b78457ff2146ae424631cdbb7a0f48afa82d76f5864a3446af64750025cdbb8031efc8014bdc678575a9c8bae0a3e3 SHA512 c996861dc99195bb28563f0d5e4791b17743351d934b49f4620fea7398080eaf09a80ad13076b16b2008e294a799d0957f54920e4d914e8955511cbcaaa5dde6
+EBUILD auctex-11.92.ebuild 1481 BLAKE2B bdc0e1ceac0c607c80405865897c909be1be015a968419e2ef7302abb104e465a54eac7dc42d1cdaca1d215dc8ccdd07452ef5db20d3b5cf9e40613da935560c SHA512 9048e1c9a7e11f5e6e8b70d50c507083f90f0a2b3d0bdcee52a320902bc4fd78a6f8069442dfef57fb6fe78d18b82bf0787d70c4a22effcd182babb9e0a9b226
+EBUILD auctex-12.1.ebuild 1500 BLAKE2B df3b2999765380b5255f0491619b0efca2c8431f755736edcb2dbbbab0942ae9170f429b708d8fbee35989dc064c1f2920d9db237fcfadb661b4a3f9f88e28fc SHA512 d0ce161a8b36a2b0324cede6149e3a9dba1caaef23530197f49465cbae68205e561fac074662911951022e5bcb82ffc5376d3747f98dfeec1c5d3f83c72a9285
+MISC metadata.xml 947 BLAKE2B 0b5e298fd9ca7112b8bd91bdc8cee455fff18d6ef21820c9e3da7058c860462fe96a7fe29792cc143d9e1876495fe3ee87e09e006b203ad448e511c12983c383 SHA512 61629e82f0004763e776db51ace13d583eac8d1199ebb61d17a101d48dd60258db4310fc938b82822c64b0ee9d39d9095fd86c316585e54ea9e7872a1247763a
diff --git a/app-emacs/auctex/auctex-11.89.ebuild b/app-emacs/auctex/auctex-11.89.ebuild
new file mode 100644
index 000000000000..28ec43658b77
--- /dev/null
+++ b/app-emacs/auctex/auctex-11.89.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Extensible package for writing and formatting TeX files in Emacs"
+HOMEPAGE="https://www.gnu.org/software/auctex/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="preview-latex"
+
+DEPEND="virtual/latex-base
+ preview-latex? (
+ app-text/dvipng
+ app-text/ghostscript-gpl
+ )"
+RDEPEND="${DEPEND}"
+
+TEXMF="/usr/share/texmf-site"
+
+src_configure() {
+ EMACS_NAME=emacs EMACS_FLAVOR=emacs econf --disable-build-dir-test \
+ --with-auto-dir="${EPREFIX}/var/lib/auctex" \
+ --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
+ --with-texmf-dir="${EPREFIX}${TEXMF}" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable preview-latex preview)
+}
+
+src_compile() {
+ export VARTEXFONTS="${T}"/fonts
+ emake
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install
+ elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+ if use preview-latex; then
+ elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el"
+ fi
+ dodoc ChangeLog* CHANGES FAQ INSTALL PROBLEMS.preview README RELEASE TODO
+}
+
+pkg_postinst() {
+ use preview-latex && texmf-update
+ elisp-site-regen
+}
+
+pkg_postrm(){
+ use preview-latex && texmf-update
+ elisp-site-regen
+}
diff --git a/app-emacs/auctex/auctex-11.90.ebuild b/app-emacs/auctex/auctex-11.90.ebuild
new file mode 100644
index 000000000000..126656ad2647
--- /dev/null
+++ b/app-emacs/auctex/auctex-11.90.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Extensible package for writing and formatting TeX files in Emacs"
+HOMEPAGE="https://www.gnu.org/software/auctex/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="preview-latex"
+
+DEPEND="virtual/latex-base
+ preview-latex? (
+ app-text/dvipng
+ app-text/ghostscript-gpl
+ )"
+RDEPEND="${DEPEND}"
+
+TEXMF="/usr/share/texmf-site"
+
+src_configure() {
+ EMACS_NAME=emacs EMACS_FLAVOR=emacs econf --disable-build-dir-test \
+ --with-auto-dir="${EPREFIX}/var/lib/auctex" \
+ --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
+ --with-texmf-dir="${EPREFIX}${TEXMF}" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable preview-latex preview)
+}
+
+src_compile() {
+ export VARTEXFONTS="${T}"/fonts
+ emake
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install
+ elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+ if use preview-latex; then
+ elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el"
+ fi
+ dodoc ChangeLog* CHANGES FAQ INSTALL PROBLEMS.preview README RELEASE TODO
+}
+
+pkg_postinst() {
+ use preview-latex && texmf-update
+ elisp-site-regen
+}
+
+pkg_postrm(){
+ use preview-latex && texmf-update
+ elisp-site-regen
+}
diff --git a/app-emacs/auctex/auctex-11.92.ebuild b/app-emacs/auctex/auctex-11.92.ebuild
new file mode 100644
index 000000000000..96cf2a9bfb02
--- /dev/null
+++ b/app-emacs/auctex/auctex-11.92.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Extensible package for writing and formatting TeX files in Emacs"
+HOMEPAGE="https://www.gnu.org/software/auctex/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="preview-latex"
+
+DEPEND="virtual/latex-base
+ preview-latex? (
+ app-text/dvipng
+ app-text/ghostscript-gpl
+ )"
+RDEPEND="${DEPEND}"
+
+TEXMF="/usr/share/texmf-site"
+
+src_configure() {
+ econf --with-emacs \
+ --with-auto-dir="${EPREFIX}/var/lib/auctex" \
+ --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
+ --with-texmf-dir="${EPREFIX}${TEXMF}" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --disable-build-dir-test \
+ $(use_enable preview-latex preview)
+}
+
+src_compile() {
+ export VARTEXFONTS="${T}"/fonts
+ emake
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install
+ elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+ if use preview-latex; then
+ elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el"
+ fi
+ dodoc ChangeLog* CHANGES FAQ INSTALL PROBLEMS.preview README RELEASE TODO
+}
+
+pkg_postinst() {
+ use preview-latex && texmf-update
+ elisp-site-regen
+}
+
+pkg_postrm(){
+ use preview-latex && texmf-update
+ elisp-site-regen
+}
diff --git a/app-emacs/auctex/auctex-12.1.ebuild b/app-emacs/auctex/auctex-12.1.ebuild
new file mode 100644
index 000000000000..1b6155aa84d1
--- /dev/null
+++ b/app-emacs/auctex/auctex-12.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Extensible package for writing and formatting TeX files in Emacs"
+HOMEPAGE="https://www.gnu.org/software/auctex/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="preview-latex"
+
+DEPEND="virtual/latex-base
+ preview-latex? (
+ app-text/dvipng
+ app-text/ghostscript-gpl
+ )"
+RDEPEND="${DEPEND}"
+
+TEXMF="/usr/share/texmf-site"
+
+src_configure() {
+ econf --with-emacs \
+ --with-auto-dir="${EPREFIX}/var/lib/auctex" \
+ --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
+ --with-texmf-dir="${EPREFIX}${TEXMF}" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --disable-build-dir-test \
+ $(use_enable preview-latex preview)
+}
+
+src_compile() {
+ export VARTEXFONTS="${T}"/fonts
+ emake
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install
+ elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+ if use preview-latex; then
+ elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el"
+ fi
+ dodoc ChangeLog* CHANGES FAQ INSTALL PROBLEMS.preview README RELEASE TODO
+}
+
+pkg_postinst() {
+ use preview-latex && texmf-update
+ elisp-site-regen
+}
+
+pkg_postrm(){
+ use preview-latex && texmf-update
+ elisp-site-regen
+}
diff --git a/app-emacs/auctex/files/50auctex-gentoo.el b/app-emacs/auctex/files/50auctex-gentoo.el
new file mode 100644
index 000000000000..ad4377967194
--- /dev/null
+++ b/app-emacs/auctex/files/50auctex-gentoo.el
@@ -0,0 +1,8 @@
+
+;;; auctex site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(require 'tex-site)
+
+;; detect needed steps after rebuild
+(setq TeX-parse-self t)
diff --git a/app-emacs/auctex/files/60auctex-gentoo.el b/app-emacs/auctex/files/60auctex-gentoo.el
new file mode 100644
index 000000000000..93b601b29769
--- /dev/null
+++ b/app-emacs/auctex/files/60auctex-gentoo.el
@@ -0,0 +1,4 @@
+
+;;; auctex site-lisp configuration, activating preview-latex
+
+(load "preview-latex.el" nil t t)
diff --git a/app-emacs/auctex/metadata.xml b/app-emacs/auctex/metadata.xml
new file mode 100644
index 000000000000..30673f0d8f3f
--- /dev/null
+++ b/app-emacs/auctex/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
+<longdescription>
+ AUCTeX is an extensible package for writing and formatting TeX files
+ in GNU Emacs and XEmacs. It supports many different TeX macro packages,
+ including AMS-TeX, LaTeX, Texinfo, ConTeXt, and docTeX (dtx files).
+
+ AUCTeX includes preview-latex which makes LaTeX a tightly integrated
+ component of your editing workflow by visualizing selected source chunks
+ (such as single formulas or graphics) directly as images in the source
+ buffer.
+</longdescription>
+<stabilize-allarches/>
+<use>
+ <flag name="preview-latex">Use bundled preview-latex</flag>
+</use>
+</pkgmetadata>
diff --git a/app-emacs/auto-complete-1.3.1 b/app-emacs/auto-complete-1.3.1
deleted file mode 100644
index d04a0d3537e2..000000000000
--- a/app-emacs/auto-complete-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Auto-complete package
-EAPI=5
-HOMEPAGE=http://cx4a.org/software/auto-complete/ https://github.com/m2ym/auto-complete/
-IUSE=l10n_ja
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ FDL-1.1+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://cx4a.org/pub/auto-complete/auto-complete-1.3.1.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=353e561a404a4db73fd756e3d72ad448
diff --git a/app-emacs/auto-complete/Manifest b/app-emacs/auto-complete/Manifest
new file mode 100644
index 000000000000..a8a333847d1f
--- /dev/null
+++ b/app-emacs/auto-complete/Manifest
@@ -0,0 +1,4 @@
+AUX 50auto-complete-gentoo.el 157 BLAKE2B abf93b1a7c9bb3d2ebabacf66c40e3177fc611330f902ef446ae31ed7f140c8fbbc68f35b40b84e83a002fe83e998d393ea4c38ed5e251f6edae08dc0adacb27 SHA512 40d03bf5dbd718aeab5d5f1ad0a15b24bebc86f641570611facf79f58f4a370da2ef1a5ca6edbbcec35d2530bdf5bf097c19c7f56c0c8f81eefa0df1a8dc01b0
+DIST auto-complete-1.3.1.tar.bz2 155081 BLAKE2B 7ceedcececcd80b7d8207cb2ff88f2bbfeee892d56a96f44c6929323ca974206b6d977830a8593ba9f7c87ba86914bf9a0771f5e11a284d7bb42fdd9e9985b48 SHA512 5b82120f8faf1ee4ff139f4fbacb894fa0bf617b9a0aaebb5a0d672a6f90cb01bc35f0c99cebe2bef55cb7a6af6ce03936a7226c89e3c79248aacf4ae554fb7b
+EBUILD auto-complete-1.3.1.ebuild 697 BLAKE2B e715d59eb08903bcee5f92b8c3ae3bb8bbc2da2a8d4327ee401465338c46945e43defcf6149a6c16ab64b0e159a99f48a29c12dd4ba7158b98fa1e491431480e SHA512 f2820f4509f6af12c131c2cfacf7306a9eb377105c5f911b2c13ca86a4de84c65df0853ec9f2391f93d75be1122e1d53e2cc26b35488b2c633735cafaaf78305
+MISC metadata.xml 363 BLAKE2B 138b2cad3896e75b8f3cb4a38d22c49aabf379cef5f5e006df38ae86bf16bfe60e62536b5af18279554ec93a596a0b483ac3f2956cd7a66e3ff980a80a2eb155 SHA512 ce1f5579523af633640669429599b8bed17f1f32c650a577b2b477d82949a8afb592712b254fb40bdc7613322781e3f47882dd851a6124013063048d2d8b7c53
diff --git a/app-emacs/auto-complete/auto-complete-1.3.1.ebuild b/app-emacs/auto-complete/auto-complete-1.3.1.ebuild
new file mode 100644
index 000000000000..ffc316f47988
--- /dev/null
+++ b/app-emacs/auto-complete/auto-complete-1.3.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Auto-complete package"
+HOMEPAGE="http://cx4a.org/software/auto-complete/
+ https://github.com/m2ym/auto-complete/"
+SRC_URI="http://cx4a.org/pub/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="l10n_ja"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+ elisp_src_install
+
+ # install dictionaries
+ insinto "${SITEETC}/${PN}"
+ doins -r dict
+
+ dodoc README.txt TODO.txt etc/test.txt
+ cd doc
+ dodoc index.txt manual.txt demo.txt changes.txt *.png
+ if use l10n_ja; then
+ dodoc index.ja.txt manual.ja.txt changes.ja.txt
+ fi
+}
diff --git a/app-emacs/auto-complete/files/50auto-complete-gentoo.el b/app-emacs/auto-complete/files/50auto-complete-gentoo.el
new file mode 100644
index 000000000000..c380d11b3a1e
--- /dev/null
+++ b/app-emacs/auto-complete/files/50auto-complete-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'auto-complete-mode "auto-complete" "AutoComplete mode" t)
+(setq ac-dictionary-directories "@SITEETC@/dict")
diff --git a/app-emacs/auto-complete/metadata.xml b/app-emacs/auto-complete/metadata.xml
new file mode 100644
index 000000000000..c09261b152ee
--- /dev/null
+++ b/app-emacs/auto-complete/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">m2ym/auto-complete</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/autoconf-mode-2.69 b/app-emacs/autoconf-mode-2.69
deleted file mode 100644
index 6323b4f3597b..000000000000
--- a/app-emacs/autoconf-mode-2.69
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major modes for editing autoconf and autotest input
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=a948ca0e5e18cfee7ee797e20750664a
diff --git a/app-emacs/autoconf-mode/Manifest b/app-emacs/autoconf-mode/Manifest
new file mode 100644
index 000000000000..d9f6b9558fda
--- /dev/null
+++ b/app-emacs/autoconf-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50autoconf-mode-gentoo.el 366 BLAKE2B 9394476da3892a5b857fe35ff9a6ecbacec761adec91465201259b03080a7303a1c5e6fe2767ffabfad1b156f4d362e1f025fef9ab131d89799912e0328090a9 SHA512 e917a5c7e7216da4624ac9463aa575569402383fd77d11b510c4752d1dfb54aa93c3cd29f3e3b198693c4f9ee9452611f5f342ecf57bf2c5f72b5e10ffab2d9f
+DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
+EBUILD autoconf-mode-2.69.ebuild 553 BLAKE2B 23eac6cc14d85b900c3aa3cd0dfada99e7b39d76d2d97a57bdd296c1026263b3820e26caf604899d90b095bae25ca6a08ee4280686743b98ae190989f81efe38 SHA512 82c68336825df0021f0452d9c071cefe932668c7c866761835dd876e4e6bb72e17f5ab0bdfb249681277cf18696addaf4d7eac4cf4fb5d0d37fa88128d639d4f
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
new file mode 100644
index 000000000000..5ebadce64015
--- /dev/null
+++ b/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Emacs major modes for editing autoconf and autotest input"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+SRC_URI="mirror://gnu/autoconf/autoconf-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/autoconf-${PV}/lib/emacs"
diff --git a/app-emacs/autoconf-mode/files/50autoconf-mode-gentoo.el b/app-emacs/autoconf-mode/files/50autoconf-mode-gentoo.el
new file mode 100644
index 000000000000..5844902596ee
--- /dev/null
+++ b/app-emacs/autoconf-mode/files/50autoconf-mode-gentoo.el
@@ -0,0 +1,9 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'autoconf-mode "autoconf-mode"
+ "Major mode for editing autoconf files." t)
+(autoload 'autotest-mode "autotest-mode"
+ "Major mode for editing autotest files." t)
+(add-to-list 'auto-mode-alist
+ '("\\.ac\\'\\|configure\\.in\\'" . autoconf-mode))
+(add-to-list 'auto-mode-alist
+ '("\\.at\\'" . autotest-mode))
diff --git a/app-emacs/autoconf-mode/metadata.xml b/app-emacs/autoconf-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/autoconf-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/basic-toolkit-0.3 b/app-emacs/basic-toolkit-0.3
deleted file mode 100644
index cf82338dd921..000000000000
--- a/app-emacs/basic-toolkit-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/windows app-emacs/cycle-buffer >=virtual/emacs-23
-DESCRIPTION=Basic edit toolkit
-EAPI=6
-HOMEPAGE=https://www.emacswiki.org/emacs/basic-toolkit.el
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=app-emacs/windows app-emacs/cycle-buffer >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/gavv/distfiles/raw/master/basic-toolkit-0.3.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=0c230d096a7327451b5e32ee55203705
diff --git a/app-emacs/basic-toolkit/Manifest b/app-emacs/basic-toolkit/Manifest
new file mode 100644
index 000000000000..66adb7de9e27
--- /dev/null
+++ b/app-emacs/basic-toolkit/Manifest
@@ -0,0 +1,4 @@
+AUX 50basic-toolkit-gentoo.el 77 BLAKE2B 62b1e6c3a3b5a134a482c24d6bd7e620109e95117d12e9e348b5628e62139edc8a237b1569e2751bb7f7284d84f1877a18baa9c933e57c174f695f218876d323 SHA512 e6e622dbb2df0d55e5f5b18e29afa95a52065783a84f3e982799c614c95f305081ec6f9214f8bb31a50eef77c7c18987259d326c5ad56d01f4130266fc29a6ef
+DIST basic-toolkit-0.3.el.xz 6524 BLAKE2B e0cebca137c786faebe5b76b1fd0e9b7181a4970aee69c1486deabd8e7712e6b54a3491768212516f9b7c8cc5a073d41dd1a22b49a3a9140ae21e1756997ea6d SHA512 3ba22833e8e899c5276e9c36779b1cffdcf3a76adaa0379a346331190f4529c8706b7e3b850768ce270016d8bc184abb4a48dc5ed11bb4766062bae966e9806d
+EBUILD basic-toolkit-0.3.ebuild 573 BLAKE2B 2a3792cdce57d01e40353f9a594222c7ee7e1462eae372971ee3cbbbe54a829e8b9edd7d4b81c2208de071f9d07888d954b53b45d53089ffcb07fff9d9933491 SHA512 614df71ae1578fbdc0c428e275dd2fa3ba63ed4fc7c3250c7b2c27922f6fa6f34c481e030c8aa81aa3ae9fde4d698b817d5564a59623415bdd6acd9ddfff3f17
+MISC metadata.xml 292 BLAKE2B 046265ce3ff94f04bba9b4b344d852203657df8dd300f30620df260bad1c56b3c23a8c48d073f70f571f733af9a7c034922e0465878028ee8f748060a6816ec6 SHA512 f0115ae686d3003f4264968d3aeb0b054830f87f35378e15e205a729d591c8697507d3c76ead9e1f0bab1f1f66a3fda108322dbcec7b857a37000511d1dd17df
diff --git a/app-emacs/basic-toolkit/basic-toolkit-0.3.ebuild b/app-emacs/basic-toolkit/basic-toolkit-0.3.ebuild
new file mode 100644
index 000000000000..bf652da1d2f0
--- /dev/null
+++ b/app-emacs/basic-toolkit/basic-toolkit-0.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Basic edit toolkit"
+HOMEPAGE="https://www.emacswiki.org/emacs/basic-toolkit.el"
+# taken from https://www.emacswiki.org/emacs/download/basic-toolkit.el
+SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-emacs/windows app-emacs/cycle-buffer"
+DEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile *.el
+ elisp-make-autoload-file
+}
diff --git a/app-emacs/basic-toolkit/files/50basic-toolkit-gentoo.el b/app-emacs/basic-toolkit/files/50basic-toolkit-gentoo.el
new file mode 100644
index 000000000000..ebb24ef6ca16
--- /dev/null
+++ b/app-emacs/basic-toolkit/files/50basic-toolkit-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "basic-toolkit-autoloads" nil t)
diff --git a/app-emacs/basic-toolkit/metadata.xml b/app-emacs/basic-toolkit/metadata.xml
new file mode 100644
index 000000000000..c6a53b949e75
--- /dev/null
+++ b/app-emacs/basic-toolkit/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/bbdb-2.35-r1 b/app-emacs/bbdb-2.35-r1
deleted file mode 100644
index c58d40c6d5e9..000000000000
--- a/app-emacs/bbdb-2.35-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=The Insidious Big Brother Database
-EAPI=4
-HOMEPAGE=http://bbdb.sourceforge.net/
-IUSE=tex
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2+ Texinfo-manual
-RDEPEND=tex? ( virtual/tex-base ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://bbdb.sourceforge.net/bbdb-2.35.tar.gz http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/point-at.el http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/dates.el
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=c7c46092f21d39aef87dd8af20b24bca
diff --git a/app-emacs/bbdb-3.1.2 b/app-emacs/bbdb-3.1.2
deleted file mode 100644
index 87f4d9a245e5..000000000000
--- a/app-emacs/bbdb-3.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=tex? ( virtual/tex-base ) vm? ( app-emacs/vm ) >=virtual/emacs-23 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=The Insidious Big Brother Database
-EAPI=5
-HOMEPAGE=https://savannah.nongnu.org/projects/bbdb/
-IUSE=tex vm
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-3+ GPL-1+ FDL-1.3+
-RDEPEND=tex? ( virtual/tex-base ) vm? ( app-emacs/vm ) >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/bbdb/bbdb-3.1.2.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c5d64fbd5cc261242cd6c4bdb4690a31
diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest
new file mode 100644
index 000000000000..60e2311ce82e
--- /dev/null
+++ b/app-emacs/bbdb/Manifest
@@ -0,0 +1,10 @@
+AUX 50bbdb-gentoo-3.1.2.el 63 BLAKE2B 4e066577f6bbc4ddcc7a5b102c1bc650fd957d82468ed9782a97520db6acb2fb600372c4fcff7c21dd020080a3d4a5f41aaea15e5751ed5f22e17b9d2e04996d SHA512 3cb67cba1e12630c40b7c78572e7af0418c56d821c327c7b963cb00401a13f47da622b3a8e7a67795158b1394e860bcdf5ac3e478f8df9c5e3a97963bbd65a2e
+AUX 50bbdb-gentoo.el 115 BLAKE2B 69ff091d2da0819ec7bbc163c453a2621c12e6e1b685b577e9c2c16bce5a9c57c7afdf7ae35d113edc0b5e6e6e433f88155123646dd01f9cdb012824b81172b4 SHA512 c04101cfe2b1a13f9f25c6a8d5a9055cc4cda6e5b9208a563e6f1ed979e2585cffca97303f192f3a2b9f755d65ec3f86e68509293b874bf8020243eedbf99c50
+AUX bbdb-3.1.2-no-init.patch 4709 BLAKE2B 3e38c67d8347a8c6202ecddfa68847f0c9feab1593d84e5564607b3d9da104af93b5bb0862e899386555dd1abe5f8b7894c71575fc6a750db2e4332c5ad9c204 SHA512 3f262323cb35636d0249aafa54ff2a2e462df803d19c356bf2b7ed6a68410fa6e6bc41298a1e7fbeef224c84cf4bf9f80ff1ae068c5226ac6bea3ec62d593355
+DIST bbdb-2.35.tar.gz 393097 BLAKE2B 194924e828cb02022e90b49bc1c1cf8cfa23146e3118dbf6be7310930463c743f1648d54daf5f605f8d7a83ea307974084cbc07d630ae2273e8147a05dced799 SHA512 ee815f62796bcda63d37ae5a3805d065f6cc79648ca86852b97d4c1b849a1eb6c8f46dab2f257b9a8f9efc44d38469739f98137037c10f79f37a1ff235f6a413
+DIST bbdb-3.1.2.tar.gz 378935 BLAKE2B 3fc862d2d68632c997e3f250aa82cced743c3cc3861c74789bb12015ab99745270c79722dc0342334b90f4dd9071ef809ab670a342ac227c24a927870907c25c SHA512 8b32baadc4eb06b0abf533ccb1f540f4f407f27b8d2e847ae25e62d1405e1de5cfc6af16368eecd4086f281ee7a4016cf25568847b3cb798156c7e18e1912576
+DIST dates.el 7048 BLAKE2B 866a9a7a5524290a7762d0ad3c7b91766ca61fa025c2f634ce11909fdbd2a6d8bd7316ec66649590148a92660ef6122c93bac8085f333f1e319cc740349a8e90 SHA512 51b0dca58a1b54e913a0dbd97df12230ec49f05b368404fa3d49cddf4ca8e14dbff47a28087c4ba41b189a38a3608c77454e102ae5bb124d07d1ad3ec9c39e71
+DIST point-at.el 440 BLAKE2B fba28258d84c378985d2f17e28f0258e1e671f831f726e1d1289e84e246d9965300aa303c7f7dd383c9d33ec84e1e8bb014bba1e4f737661a5522a37ce6541ad SHA512 e38cbf39cb3f29f51f6759a7ba548f065c4763668d38c746eb69d9ab2384357f6b1c7f032a6afe739bc64658f5863730b7a4b3023cc9df1cc5e088e591c02760
+EBUILD bbdb-2.35-r1.ebuild 1831 BLAKE2B 27d7dc2da5c45c33d827030d6381b5cd329205c1ea7e51a65b2bd9c1805c0feb9b3fbe065de88f661715468f9a1873f1f26f8d0b4736ee84c158d14dfdb31310 SHA512 7b6a393f6c22933f748de30ce1be9a1b58d0f2d5ed90b403bb232cfb7eace715f14feb962c2543f15d458c11bd6131c2cdcc72cff3830008d8091d8f0726f311
+EBUILD bbdb-3.1.2.ebuild 1236 BLAKE2B b8d33d9d94984aad113fba3fa3ab2e6fdd75b1df4dab9803efe213dc84267fe1ec84625ff9d66bb90e45943c9cb0f3ded556ba7085f2a1201ba353c4b0904762 SHA512 b0a57c163c29f7eb3682ffc4ea6f1da679d9f238194d68d86785994009c96f34f41e97ec77a09f89d804767cb2f49a31cf5326256c8efffc8d4d54d3a3495695
+MISC metadata.xml 753 BLAKE2B 34f54aee0c3090fa9d9ee231f1f3ada71e889a4c4d7db76be9f0e351a4ae2333230c3338b014c2b267fd24610d788ede12749fe135f14d9760e76bd4e47d2827 SHA512 76dad950ad39c0f3442e2339dbf560154cc1b0685137c81e64224686ee31ff856dbd147aa04202250fa9595510c991d15609aec986dab26ad60bda3744902dda
diff --git a/app-emacs/bbdb/bbdb-2.35-r1.ebuild b/app-emacs/bbdb/bbdb-2.35-r1.ebuild
new file mode 100644
index 000000000000..f603c567dd93
--- /dev/null
+++ b/app-emacs/bbdb/bbdb-2.35-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="The Insidious Big Brother Database"
+HOMEPAGE="http://bbdb.sourceforge.net/"
+SRC_URI="http://bbdb.sourceforge.net/${P}.tar.gz
+ http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/point-at.el
+ http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/dates.el"
+
+LICENSE="GPL-2+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="tex"
+
+RDEPEND="tex? ( virtual/tex-base )"
+
+SITEFILE="50${PN}-gentoo.el"
+TEXMF="/usr/share/texmf-site"
+
+src_prepare() {
+ sed -i -e '0,/^--- bbdb-mail-folders.el ---$/d;/^--- end ---$/,$d' \
+ bits/bbdb-mail-folders.el || die "sed failed"
+ sed -i -e '/^;/,$!d' bits/bbdb-sort-mailrc.el || die "sed failed"
+ cp "${DISTDIR}"/{dates,point-at}.el bits || die "cp failed"
+}
+
+src_configure() {
+ default
+}
+
+src_compile() {
+ emake -j1
+ BYTECOMPFLAGS="-L bits -L lisp" elisp-compile bits/*.el || die
+}
+
+src_install() {
+ elisp-install ${PN} lisp/*.el{,c} || die
+ elisp-install ${PN}/bits bits/*.el{,c} || die
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ doinfo texinfo/*.info*
+ dodoc ChangeLog INSTALL README bits/*.txt
+ newdoc bits/README README.bits
+ if use tex; then
+ insinto "${TEXMF}"/tex/plain/bbdb
+ doins tex/*.tex
+ fi
+}
+
+pkg_postinst() {
+ elisp-site-regen
+ use tex && texconfig rehash
+
+ elog "If you use encryption or signing, you may specify the encryption"
+ elog "method by customising variable \"bbdb/pgp-method\". For details,"
+ elog "see the documentation of this variable. Depending on the Emacs"
+ elog "version, installation of additional packages like app-emacs/gnus"
+ elog "or app-emacs/mailcrypt may be required."
+}
+
+pkg_postrm() {
+ elisp-site-regen
+ use tex && texconfig rehash
+}
diff --git a/app-emacs/bbdb/bbdb-3.1.2.ebuild b/app-emacs/bbdb/bbdb-3.1.2.ebuild
new file mode 100644
index 000000000000..58c9da5277c0
--- /dev/null
+++ b/app-emacs/bbdb/bbdb-3.1.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp autotools
+
+DESCRIPTION="The Insidious Big Brother Database"
+HOMEPAGE="https://savannah.nongnu.org/projects/bbdb/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ GPL-1+ FDL-1.3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="tex vm"
+RESTRICT="test" #631700
+
+DEPEND="tex? ( virtual/tex-base )
+ vm? ( app-emacs/vm )"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo-${PV}.el"
+TEXMF="/usr/share/texmf-site"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-no-init.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+ "$(use_with vm vm-dir "${EPREFIX}${SITELISP}/vm")"
+}
+
+src_compile() {
+ emake -C lisp
+}
+
+src_install() {
+ emake -C lisp DESTDIR="${D}" install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ doinfo doc/*.info*
+ dodoc AUTHORS ChangeLog NEWS README TODO
+
+ if use tex; then
+ insinto "${TEXMF}"/tex/plain/${PN}
+ doins tex/*.tex
+ fi
+}
+
+pkg_postinst() {
+ elisp-site-regen
+ use tex && texconfig rehash
+}
+
+pkg_postrm() {
+ elisp-site-regen
+ use tex && texconfig rehash
+}
diff --git a/app-emacs/bbdb/files/50bbdb-gentoo-3.1.2.el b/app-emacs/bbdb/files/50bbdb-gentoo-3.1.2.el
new file mode 100644
index 000000000000..45a7cc208e0d
--- /dev/null
+++ b/app-emacs/bbdb/files/50bbdb-gentoo-3.1.2.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'bbdb-loaddefs)
diff --git a/app-emacs/bbdb/files/50bbdb-gentoo.el b/app-emacs/bbdb/files/50bbdb-gentoo.el
new file mode 100644
index 000000000000..7953b3c852a4
--- /dev/null
+++ b/app-emacs/bbdb/files/50bbdb-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'load-path "@SITELISP@/bits")
+(require 'bbdb)
+(bbdb-initialize)
diff --git a/app-emacs/bbdb/files/bbdb-3.1.2-no-init.patch b/app-emacs/bbdb/files/bbdb-3.1.2-no-init.patch
new file mode 100644
index 000000000000..85dbc0374e32
--- /dev/null
+++ b/app-emacs/bbdb/files/bbdb-3.1.2-no-init.patch
@@ -0,0 +1,126 @@
+Patch from upstream, backported to bbdb-3.1.2.
+
+From e028f4d8f04c3db663db023cf5a630461cfda2bd Mon Sep 17 00:00:00 2001
+From: Roland Winkler <winkler@gnu.org>
+Date: Wed, 23 Jul 2014 03:27:09 +0000
+Subject: Do not load init file or site file for byte compilation
+
+--- bbdb-3.1.2-orig/lisp/Makefile.am
++++ bbdb-3.1.2/lisp/Makefile.am
+@@ -20,6 +20,9 @@
+ # You should have received a copy of the GNU General Public License
+ # along with BBDB. If not, see <http://www.gnu.org/licenses/>.
+
++# --batch implies --no-init-file, yet let's be explicit about what we want
++AM_ELCFLAGS += --no-init-file --no-site-file
++
+ dist_lisp_LISP = \
+ bbdb.el \
+ bbdb-anniv.el \
+@@ -70,10 +73,11 @@
+ @echo " " >> $@;
+ # Generated autoload-file must have an absolute path,
+ # $srcdir can be relative.
+- $(EMACS) -batch -l autoload \
++ $(EMACS) --batch $(AM_ELCFLAGS) $(ELCFLAGS) \
++ --load autoload \
+ --eval '(setq generated-autoload-file "'$(abs_builddir)/$@'")' \
+ --eval '(setq make-backup-files nil)' \
+- -f batch-update-autoloads $(srcdir)
++ --funcall batch-update-autoloads $(srcdir)
+
+ # Generate bbdb-site.el here as pkgdatadir is only known at "make" time.
+ # We protect the autoconf variables in the sed regular expressions
+--- bbdb-3.1.2-orig/lisp/makefile-temp
++++ bbdb-3.1.2/lisp/makefile-temp
+@@ -43,13 +43,16 @@
+ EMACSOPT =
+
+ # The actual Emacs command run in the targets below.
+-emacs = LC_ALL=C $(EMACS) --batch --directory=./ $(EMACSOPT)
++# --batch implies --no-init-file, yet let's be explicit about what we want
++emacs = LC_ALL=C $(EMACS) --batch --no-init-file --no-site-file \
++ --directory=./ $(EMACSOPT)
++emacs_compile = $(emacs) --funcall batch-byte-compile
+
+-# If you want to use BBDB with VM this should point to your vm/lisp directory.
+-# See also the target all below.
++# VM is not part of GNU Emacs. If you want to use BBDB with VM
++# then the variable VMDIR should point to your vm/lisp directory.
+ VMDIR =
+
+-VM = -eval '(unless (string-match "$(VMDIR)" "") (push "$(VMDIR)" load-path))'
++VM = -eval '(unless (string= "$(VMDIR)" "") (push "$(VMDIR)" load-path))'
+
+ .SUFFIXES: .elc .el .tar .Z .gz .uu
+
+@@ -89,51 +92,50 @@
+ @echo " " >> $@;
+ # Generated autoload-file must have an absolute path,
+ # $(srcdir) can be relative.
+- $(emacs) -l autoload \
++ $(emacs) --load autoload \
+ --eval '(setq generated-autoload-file "'`pwd`/$@'")' \
+ --eval '(setq make-backup-files nil)' \
+- -f batch-update-autoloads `pwd`
++ --funcall batch-update-autoloads `pwd`
+
+ .el.elc:
+- $(emacs) -f batch-byte-compile $<
++ $(emacs_compile) $<
+
+ # Not perfect, but better than nothing: If we do not have / do not use
+ # autotools, we simply copy bbdb-site.el.in to bbdb-site.el.
+ bbdb-site.el: bbdb-site.el.in
+ $(CP) $< $@
+ bbdb-site.elc: bbdb-site.el
+- $(emacs) -f batch-byte-compile $(@:.elc=.el)
++ $(emacs_compile) $(@:.elc=.el)
+
+ bbdb.elc: bbdb.el bbdb-site.elc
+- $(emacs) -f batch-byte-compile $(@:.elc=.el)
++ $(emacs_compile) $(@:.elc=.el)
+
+ bbdb-com.elc: bbdb-com.el bbdb.elc
+- $(emacs) -f batch-byte-compile $(@:.elc=.el)
++ $(emacs_compile) $(@:.elc=.el)
+ bbdb-mua.elc: bbdb-mua.el bbdb-com.elc
+- $(emacs) -eval '(unless (string= "$(VMDIR)" "") (push "$(VMDIR)" load-path) (load "vm" t t))' \
+- -f batch-byte-compile $(@:.elc=.el)
++ $(emacs_compile) -eval '(unless (string= "$(VMDIR)" "") (push "$(VMDIR)" load-path) (load "vm" t t))' \
++ $(@:.elc=.el)
+ bbdb-rmail.elc: bbdb-rmail.el bbdb-mua.elc
+- $(emacs) -f batch-byte-compile $(@:.elc=.el)
++ $(emacs_compile) $(@:.elc=.el)
+ bbdb-gnus.elc: bbdb-gnus.el bbdb-mua.elc
+- $(emacs) -f batch-byte-compile $(@:.elc=.el)
++ $(emacs_compile) $(@:.elc=.el)
+ bbdb-mhe.elc: bbdb-mhe.el bbdb-mua.elc
+- $(emacs) -f batch-byte-compile $(@:.elc=.el)
+-# VM is not part of GNU Emacs
++ $(emacs_compile) $(@:.elc=.el)
+ bbdb-vm.elc: bbdb-vm.el bbdb-mua.elc
+- $(emacs) $(VM) -f batch-byte-compile $(@:.elc=.el)
++ $(emacs_compile) $(VM) $(@:.elc=.el)
+ bbdb-sc.elc: bbdb-sc.el bbdb-mua.elc
+- $(emacs) -f batch-byte-compile $(@:.elc=.el)
++ $(emacs_compile) $(@:.elc=.el)
+
+ bbdb-print.elc: bbdb-print.el bbdb-com.elc
+- $(emacs) -f batch-byte-compile $(@:.elc=.el)
++ $(emacs_compile) $(@:.elc=.el)
+ bbdb-migrate.elc: bbdb-migrate.el bbdb.elc
+- $(emacs) -f batch-byte-compile $(@:.elc=.el)
++ $(emacs_compile) $(@:.elc=.el)
+ bbdb-anniv.elc: bbdb-anniv.el bbdb-com.elc
+- $(emacs) -f batch-byte-compile $(@:.elc=.el)
++ $(emacs_compile) $(@:.elc=.el)
+ bbdb-ispell.elc: bbdb-ispell.el bbdb.elc
+- $(emacs) -f batch-byte-compile $(@:.elc=.el)
++ $(emacs_compile) $(@:.elc=.el)
+ bbdb-snarf.elc: bbdb-snarf.el bbdb-com.elc
+- $(emacs) -f batch-byte-compile $(@:.elc=.el)
++ $(emacs_compile) $(@:.elc=.el)
+
+ install-el: all
+ $(INSTALL) -d -m 0755 "$(lispdir)/"
diff --git a/app-emacs/bbdb/metadata.xml b/app-emacs/bbdb/metadata.xml
new file mode 100644
index 000000000000..9e8a37cb0c45
--- /dev/null
+++ b/app-emacs/bbdb/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ The Insidious Big Brother Database (BBDB) is a contact management utility
+ for use with GNU Emacs and XEmacs. It can hook into Emacs-based mail- and
+ news-readers and automatically collect information on messages therein.
+</longdescription>
+<stabilize-allarches/>
+<use>
+ <flag name="tex">Install plain TeX support files</flag>
+ <flag name="vm">Add support for <pkg>app-emacs/vm</pkg></flag>
+</use>
+<upstream>
+ <remote-id type="sourceforge">bbdb</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/binclock-1.7-r1 b/app-emacs/binclock-1.7-r1
deleted file mode 100644
index ed512898c312..000000000000
--- a/app-emacs/binclock-1.7-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Display the current time using a binary clock
-EAPI=4
-HOMEPAGE=http://www.davep.org/emacs/
-KEYWORDS=~alpha amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/binclock-1.7.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=9e1faba3da55aff056e752ee3152fb8f
diff --git a/app-emacs/binclock/Manifest b/app-emacs/binclock/Manifest
new file mode 100644
index 000000000000..6e7e0a24625b
--- /dev/null
+++ b/app-emacs/binclock/Manifest
@@ -0,0 +1,4 @@
+AUX 50binclock-gentoo.el 100 BLAKE2B 99f128a3e3033ffabad1d18281dd70d091bfa1ad7ba213a87383bd0305829e5368a8d006a6a33bb2a6280726af11df28b6711bc8037fddf6b6b1ae254022abd6 SHA512 08997bbbba82da6b79ae2b8f60396b219bd837674d16a658c62306e13e3fe667d228c7e6e0949b9b44a2a346d3f5d2996cc853c2180ad1c1d877940da97a31f0
+DIST binclock-1.7.tar.bz2 2734 BLAKE2B 57d872b2dc4259ca8cb033b8ff5359dd9f57fa2c7469b1ab6f2d0871cae74efef3f4874fac712b63ff783f50e0722e1959586a2e194426e0098c4e3bf16d8b5a SHA512 fe7d69605dc72777236930368e2900b71717a0a96655afa939c9cfcf76fb6cccc8c21cd81e933eed210a9e948b6d3681eb60f494f4aef276a1026a6dfe186354
+EBUILD binclock-1.7-r1.ebuild 371 BLAKE2B 82e85995423219adde1549f8c21503b1d1852b9b51ebe717938d133aac900da4c4c327cff0028b1c8f87af2beb22258e0b1a2957ebfc150727cf06560e289226 SHA512 9f6290b510f1087adc45319a274ae010c4dfc2483386d89847c00f4fc020bac9c046e1f82a7d8797dfe066f346f82ce95ade431c2295881598f9aea3ac0d7376
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/binclock/binclock-1.7-r1.ebuild b/app-emacs/binclock/binclock-1.7-r1.ebuild
new file mode 100644
index 000000000000..9eaedd455648
--- /dev/null
+++ b/app-emacs/binclock/binclock-1.7-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Display the current time using a binary clock"
+HOMEPAGE="http://www.davep.org/emacs/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
+IUSE=""
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/binclock/files/50binclock-gentoo.el b/app-emacs/binclock/files/50binclock-gentoo.el
new file mode 100644
index 000000000000..21f1d818d190
--- /dev/null
+++ b/app-emacs/binclock/files/50binclock-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'binclock "binclock" "Display the binary clock." t)
diff --git a/app-emacs/binclock/metadata.xml b/app-emacs/binclock/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/binclock/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/bison-mode-0.3 b/app-emacs/bison-mode-0.3
deleted file mode 100644
index 99965632d1b4..000000000000
--- a/app-emacs/bison-mode-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major mode for Bison, Yacc and Lex grammars
-EAPI=5
-HOMEPAGE=https://github.com/Wilfred/bison-mode
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~nicolasbock/bison-mode-0.3.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=f6114b331d83c9457c02563141761d21
diff --git a/app-emacs/bison-mode/Manifest b/app-emacs/bison-mode/Manifest
new file mode 100644
index 000000000000..24780d3244c3
--- /dev/null
+++ b/app-emacs/bison-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50bison-mode-gentoo.el 130 BLAKE2B 9f96fc48a60b461675dd893c4489b1dbc60b7c1fb5a026b6a3c3f648874cdbd9a8130939800f61e533d830d58421a52e8087081bdf64f3eabd66c3b52cacf61d SHA512 50b14d2baddf3c2c7597d202264c19bdefe094f887f20b4f4b96f8de0ad11d520f249ebc09fc8f8200413824bc84495955ccfb6123140972cd14e4524be94feb
+DIST bison-mode-0.3.tar.bz2 7541 BLAKE2B ddd8d75f264a5f3fd38bb1b2df28973958e176c434fbc6d52c0afd9c38327b4be760407046ec359b93eb8fe5067774141ff97c66570a96990db1ae6b7a1e69bc SHA512 b3b173152700562f813534d9352ed50cfac8ad131f037b1e2bf9d1370f0b56f109f14206cbfde82acac0c93a1bc0092da7f78c1b42fc3154248dfb1222a7f85b
+EBUILD bison-mode-0.3.ebuild 400 BLAKE2B 85510472fe3d767676996ce00f466cd7a246cb71e4d1957c7b5bc7f5c16233cc0dc75d5f159b8731346bc0d91875bb9aee11e98a0e5b1c5896583d6253e19c2a SHA512 99f74638ffcf53595b90303e9c4482600214618a8ee147bd6e6a8372a2cb538a10ce24af9535d65c2e6504e672558164096b13fb3854aaeadabe6cd91742fe7f
+MISC metadata.xml 472 BLAKE2B d9562ac08d14c9760f39d3aae0fa0de3ee6b30bd20f7e883c18628edd5309ac175bf26aec2cfce5dd3bfb80a0b31b9e14b287f8f2570f5eeb40c0807a68ca24d SHA512 9863f08c8821e6938980fe58138d4534749921a84e8af8de2f51f8da30598d66a3e81ee533d4550811cf449adb14ffde10481d61f869b7fade850299376e19a6
diff --git a/app-emacs/bison-mode/bison-mode-0.3.ebuild b/app-emacs/bison-mode/bison-mode-0.3.ebuild
new file mode 100644
index 000000000000..adc138ea19df
--- /dev/null
+++ b/app-emacs/bison-mode/bison-mode-0.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for Bison, Yacc and Lex grammars"
+HOMEPAGE="https://github.com/Wilfred/bison-mode"
+SRC_URI="https://dev.gentoo.org/~nicolasbock/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emacs/bison-mode/files/50bison-mode-gentoo.el b/app-emacs/bison-mode/files/50bison-mode-gentoo.el
new file mode 100644
index 000000000000..57c4890db3b8
--- /dev/null
+++ b/app-emacs/bison-mode/files/50bison-mode-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'bison-mode "bison-mode"
+ "Emacs major mode for Bison, Yacc and Lex grammars" t)
diff --git a/app-emacs/bison-mode/metadata.xml b/app-emacs/bison-mode/metadata.xml
new file mode 100644
index 000000000000..3f85b297cb43
--- /dev/null
+++ b/app-emacs/bison-mode/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>nicolasbock@gentoo.org</email>
+ <name>Nicolas Bock</name>
+</maintainer>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">Wilfred/bison-mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/blogmax-20110305 b/app-emacs/blogmax-20110305
deleted file mode 100644
index d46065eda7af..000000000000
--- a/app-emacs/blogmax-20110305
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-arch/unzip >=virtual/emacs-23
-DESCRIPTION=Blogging in Emacs
-EAPI=5
-HOMEPAGE=http://billstclair.com/blogmax/index.html
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-1+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/blogmax-20110305.zip
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93a360bdc45a7fc2b8e172fdae55b86e
diff --git a/app-emacs/blogmax/Manifest b/app-emacs/blogmax/Manifest
new file mode 100644
index 000000000000..1046ea561d62
--- /dev/null
+++ b/app-emacs/blogmax/Manifest
@@ -0,0 +1,5 @@
+AUX 50blogmax-gentoo.el 203 BLAKE2B 13d5f7436a13426fc3b33f9d84f45c011386d3b062acf4297c81f48d2cfc02fcd24c80292fb66152b9b0e4c968423648a99ddd6ef0bf9a4d5164e3ee5bfb330f SHA512 33bfaa0a6861bf4dcd402e3f24e999f5206235d69a9e7674c43d408e85438fd450810522a2e3bc42f5457ded290d67700e71a512603f62d64ecab82d4d2fd78c
+AUX README.Gentoo 246 BLAKE2B 51cb9a5d3b6043baa30655e90b2bec57620a0d5dfdea2f718b9f519a2d89619a3bfc3702915948c6bfb6d145c798f13f089582af7db8ea1754f5e50ebb95d4b8 SHA512 38559a4b05509061ed5026f1e7b4936da8d90d965fa8db3e5e087d7eeedc8a33a96eee4c6e6a8b76f6fc224062ee78f252dc17bb918248c2df313a258d1b2dc0
+DIST blogmax-20110305.zip 194956 BLAKE2B b5f90254a218fc45b65faa8d5cdc53ec55f092716286a5757f483eed621d2142aeda398449b1c1b9c3acad67575025ce6bf9b9dce42f1d97d35227d13a0aa65e SHA512 dc0529c5d61ea9beaecf9dfdfe0631ae31fb9737845aa81f2ac7c19df7aa30eb7392f73ea96a00b678cd441f0815129bb04d521e697ce2cb3938d8699483d19b
+EBUILD blogmax-20110305.ebuild 987 BLAKE2B 8be3b8ad56bafc12bf4ab2dd72c67f8d400cd3ebf6ed607c70d47bf8fe027f6235f8ede6a90f19574dd90acda381e5cfdf45a546055a35ace8be76f27fc8716b SHA512 c80b0c0bd9e3d84e1f53d579c9f6a6f027ae6c7a967c628cc591d27c1c479c207dbc11c548fede045764c866d7c06f6d14809415bf10816fc2e2a4a8432ddda7
+MISC metadata.xml 388 BLAKE2B 14e7039960527342a1837a45bc3d4a5da96f924573067aab0066b053dc24b26197d6bd4c113c87526c3c2f50bdf152df43bbbc25885e7d76c9cd5f846094e899 SHA512 b794dbcab7f297bb941a561495b2d4b7863476f7204c7d240bbb99391c99441ff8e482b88f9664ad75a96f1cb4bf77a2e709301d4897d836297adf551aa519c2
diff --git a/app-emacs/blogmax/blogmax-20110305.ebuild b/app-emacs/blogmax/blogmax-20110305.ebuild
new file mode 100644
index 000000000000..07505c200b1f
--- /dev/null
+++ b/app-emacs/blogmax/blogmax-20110305.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils readme.gentoo elisp
+
+DESCRIPTION="Blogging in Emacs"
+HOMEPAGE="http://billstclair.com/blogmax/index.html"
+# taken from http://billstclair.com/blogmax.zip
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.zip"
+
+LICENSE="GPL-1+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ rm *.elc gpl.txt || die
+ edos2unix *.{el,html,inc,ini,tmpl,txt,xml} docs/*.{html,txt}
+}
+
+src_compile() {
+ elisp-compile blogmax.el
+}
+
+src_install() {
+ elisp-install ${PN} blogmax.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ DOC_CONTENTS="To get started with BlogMax, use the example site file
+ from /usr/share/doc/${PF}/example as a template for your own blog."
+ readme.gentoo_create_doc
+
+ dodoc README
+ dodoc -r docs
+ docinto example
+ dodoc *.{html,inc,ini,png,tmpl,txt,xml}
+}
diff --git a/app-emacs/blogmax/files/50blogmax-gentoo.el b/app-emacs/blogmax/files/50blogmax-gentoo.el
new file mode 100644
index 000000000000..fc110114b3a6
--- /dev/null
+++ b/app-emacs/blogmax/files/50blogmax-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'weblog-mode "blogmax" "Weblog" t)
+(autoload 'weblog-set-buffer-mode "blogmax"
+ "Set the mode to weblog-mode for text files in the *weblog-directory*" t)
diff --git a/app-emacs/blogmax/files/README.Gentoo b/app-emacs/blogmax/files/README.Gentoo
new file mode 100644
index 000000000000..a737d0f9c9ac
--- /dev/null
+++ b/app-emacs/blogmax/files/README.Gentoo
@@ -0,0 +1,8 @@
+ -*-outline-*-
+* Getting Started With BlogMax
+
+Use the example site file from /usr/share/doc/blogmax-*/example as a
+template for your own blog.
+
+--
+Matthew Kennedy <mkennedy@gentoo.org>
diff --git a/app-emacs/blogmax/metadata.xml b/app-emacs/blogmax/metadata.xml
new file mode 100644
index 000000000000..18aa34682d6d
--- /dev/null
+++ b/app-emacs/blogmax/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ BlogMax is an Emacs package that aids in the creation of a weblog.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/bm-1.32_p20140214 b/app-emacs/bm-1.32_p20140214
deleted file mode 100644
index adbc116cc1b9..000000000000
--- a/app-emacs/bm-1.32_p20140214
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Visible bookmarks in buffer
-EAPI=5
-HOMEPAGE=https://www.nongnu.org/bm/ https://www.emacswiki.org/emacs/VisibleBookmarks
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/bm-1.32_p20140214.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=6df1ff33b1abbb61255de347bbe6d2e7
diff --git a/app-emacs/bm/Manifest b/app-emacs/bm/Manifest
new file mode 100644
index 000000000000..f7ca49d1bd95
--- /dev/null
+++ b/app-emacs/bm/Manifest
@@ -0,0 +1,4 @@
+AUX 50bm-gentoo.el 205 BLAKE2B 4c4921b1b7939a0d3cc831297c6c1bef596392c31c7eac3ad2826d55b9a0edee67c4d9cf4a6e2b46ba754850cfd2b8aaecb352ac83ff4f6d45c6fe51405b3552 SHA512 b5c80ab592a9b78a3441494f6211801d3e001f77985ea2e78b982541f534780b12ff26fb6dd7cf7cb371cb8d3fa2fdf01b55227e40980b94a7e07a45dd583a8a
+DIST bm-1.32_p20140214.tar.xz 11800 BLAKE2B 0c27f35a64dac09e5fff4391d6958ce5b2a2a6a8194a29500322137979e5fc0618fe1d47ca844bccba78d388d8a2569c5742f1a531c43c42a02845a31fb1f6c2 SHA512 0a40c5dc3d21c0b8af7e885f7e2f48c92413dff48a6a3a10366f9a63274886cd22a247b61ef25e4ad1f283446b05093658f233c6501c6d0bf5312d9a67b83ff4
+EBUILD bm-1.32_p20140214.ebuild 513 BLAKE2B f5707073b30788957727dd0f2ddee9da571dc0d1947fee8b2f97b1886909d322238fdd36719739f529c0022554e008e6b79b0dc65bd60addab653b19ae1281c3 SHA512 7be9d695de562bff41b7b80721376fc8c8faa717d3e3da9839c21d8b318e16f07891af24d50c4b183f17f4a35ae6de3c8173508a88a0212e849fd962a6999cc1
+MISC metadata.xml 445 BLAKE2B ce243d62639ee652b310e175715d81fb020cb41e4076970b03f895e728eb190fa1c2fa573ed2a995e406296cba21aa08fe4e92930a57062d56e7e0a68aef3a10 SHA512 d1a2573b8c516169b9d0a90dc89b650a4497080658d5af6fce70204c68b3c1b591dc724e9733957632727da0c014186d341a264c21665d6dbe0b021b87a2d201
diff --git a/app-emacs/bm/bm-1.32_p20140214.ebuild b/app-emacs/bm/bm-1.32_p20140214.ebuild
new file mode 100644
index 000000000000..559611b49d1d
--- /dev/null
+++ b/app-emacs/bm/bm-1.32_p20140214.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Visible bookmarks in buffer"
+HOMEPAGE="https://www.nongnu.org/bm/
+ https://www.emacswiki.org/emacs/VisibleBookmarks"
+# snapshot of https://github.com/joodland/bm.git
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+S="${WORKDIR}/${PN}"
+ELISP_REMOVE="bm-tests.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emacs/bm/files/50bm-gentoo.el b/app-emacs/bm/files/50bm-gentoo.el
new file mode 100644
index 000000000000..fd404a9efb81
--- /dev/null
+++ b/app-emacs/bm/files/50bm-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'bm-toggle "bm" "Toggle bookmark in current buffer." t)
+(autoload 'bm-next "bm" "Goto bookmark." t)
+(autoload 'bm-previous "bm" "Goto previous bookmark." t)
diff --git a/app-emacs/bm/metadata.xml b/app-emacs/bm/metadata.xml
new file mode 100644
index 000000000000..4ac744068434
--- /dev/null
+++ b/app-emacs/bm/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ This package provides visible, buffer local, bookmarks and the ability to
+ jump forward and backward to the next bookmark.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/bongo-20110621 b/app-emacs/bongo-20110621
deleted file mode 100644
index 4be3826b29c9..000000000000
--- a/app-emacs/bongo-20110621
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/volume sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=Buffer-oriented media player for Emacs
-EAPI=5
-HOMEPAGE=http://www.brockman.se/software/bongo/
-IUSE=mplayer
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ FDL-1.2+
-RDEPEND=app-emacs/volume >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/bongo-20110621.tar.xz mplayer? ( mirror://gentoo/bongo-mplayer-20070204.tar.bz2 )
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5f0bf496d9ab7628f9cc714088551254
diff --git a/app-emacs/bongo/Manifest b/app-emacs/bongo/Manifest
new file mode 100644
index 000000000000..f683d36f55f2
--- /dev/null
+++ b/app-emacs/bongo/Manifest
@@ -0,0 +1,7 @@
+AUX 50bongo-gentoo.el 192 BLAKE2B 45600e17a12ca18572eb8112d40cd60f74ffe8569a592610829ecd289281a2440ece63fcd9d41733cc9a5817df07e32705173c6fe81bd09a989ce8553dd4a082 SHA512 57d89540ca341578d2ee4c2dd067b4532205874d88ef7d54be065abeb7c1d1e0ca295cf02d02cda6cf8fbc708a5946fc7f2d0541975bc5d56a9b06d27cf175f9
+AUX bongo-20070619-fix-require.patch 224 BLAKE2B c2668c5a34e003c4bdc4efe1ed789d7c6496032b003a94ff824036ca004c8bfdc56f11e0b7f88639b2c5b92792ab623ba097dbf1e86039cbd5d332ca7947462a SHA512 968d2c55d6abd0f22c238e7488c8c96d3faf08df9e74d83cae63df35be556f70608e63e525e280bc497172548678a9c8df976eca342e0190ad58622c1411cffe
+AUX bongo-20110621-texinfo-5.patch 258 BLAKE2B 0b4566c08b1a96874220f7b615bf16f3f4457f3872a89f82d1e4d9dc346e3b599da9611ec6b424e1f3b594bfc6afc2b1539ec8aaf7aeb8a1059481b39c9cb2c2 SHA512 ae03701a1372ee142902763d68d73a3fc0a3862fa7c9b5cbe916a85d965af0f6f2acc859564b56c5336eb1db1400d9f3e36c7f376b44b1dc7caad405a547a2b8
+DIST bongo-20110621.tar.xz 97652 BLAKE2B a3fd04f24b122af580e75ed68ad42dcd99045ab9cc7ea9fd273c9b256dc732fd6a0328f15489a50b427c85dad4de1ea2254afc257a9e3f2896baeefc1cff1c56 SHA512 31c2a477cfb5ff36fbc64da29c725db0b0242ea09f80883fb21feb3b23f5c14c688379c4c4e53b26ffef3aca5d2813d5b2a38b91266da088c73516f7ea1d712b
+DIST bongo-mplayer-20070204.tar.bz2 3563 BLAKE2B 684c702da46fedd365f780b165619b20e5da643db7b457cc527017971e18a2b0e843896d28216527adbda1e6e7432ff081a7368b697256ac79f2032b30d97123 SHA512 e503ed7980f011a6fc3fa75d0bb9b1cec1ed49d4fb07da92aad65e3c5096b42cf9eb203a8edbb93f2e7924254e4926e9f3fcf473de877fea130557aefad73ebd
+EBUILD bongo-20110621.ebuild 1155 BLAKE2B f4d555d08f793f1af0585f66d9b2680ea4b2b937ab37028c8f55b5c1965a59d98e97a1514d9f7c5ab4042ec5ce3d626bbb35eb78ada5fe8ce6150e84063e20a6 SHA512 6544d4e41b2359f37d1c3b896ae7993a27f69c7fec6541eddd893804b57ba3908d1519c679335d5b199747bc21415a05d00ede6fc089df26149ac333127b0f35
+MISC metadata.xml 1729 BLAKE2B b30c20f0fe63c627f79349ff20b07250759f6072c5b6dcfd5075359463b2c6256792e0d42b9ba57348c93947096ec86c60fae7acae3613971fa669505b58cdff SHA512 a8a11da7b2f1ed427d9571ea6259b3b0ed3d99a412bd05e4f01a57b4f5da05f11fb6e6006db1bfc624ed341f198dc8a4bef35ce5237119cee99a6d45687f2048
diff --git a/app-emacs/bongo/bongo-20110621.ebuild b/app-emacs/bongo/bongo-20110621.ebuild
new file mode 100644
index 000000000000..5aa2f60e6c65
--- /dev/null
+++ b/app-emacs/bongo/bongo-20110621.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp eutils
+
+DESCRIPTION="Buffer-oriented media player for Emacs"
+HOMEPAGE="http://www.brockman.se/software/bongo/"
+# Darcs snapshot of http://www.brockman.se/software/bongo/
+# MPlayer support from http://www.emacswiki.org/emacs/bongo-mplayer.el
+SRC_URI="mirror://gentoo/${P}.tar.xz
+ mplayer? ( mirror://gentoo/${PN}-mplayer-20070204.tar.bz2 )"
+
+LICENSE="GPL-2+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mplayer"
+
+# NOTE: Bongo can use almost anything for playing media files, therefore
+# the dependency possibilities are so broad that we refrain from including
+# any media players explicitly in DEPEND/RDEPEND.
+
+RDEPEND="app-emacs/volume"
+DEPEND="${RDEPEND}
+ sys-apps/texinfo"
+
+S="${WORKDIR}/${PN}"
+DOCS="AUTHORS HISTORY NEWS README.rdoc"
+ELISP_PATCHES="${PN}-20070619-fix-require.patch
+ ${P}-texinfo-5.patch"
+ELISP_REMOVE="bongo-emacs21.el" # Don't bother with Emacs 21
+ELISP_TEXINFO="${PN}.texinfo"
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+ elisp_src_install
+ insinto "${SITEETC}/${PN}"
+ doins etc/*.pbm etc/*.png
+}
diff --git a/app-emacs/bongo/files/50bongo-gentoo.el b/app-emacs/bongo/files/50bongo-gentoo.el
new file mode 100644
index 000000000000..099de2b3dd74
--- /dev/null
+++ b/app-emacs/bongo/files/50bongo-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(if (boundp 'image-load-path)
+ (add-to-list 'image-load-path "@SITEETC@" t))
+(autoload 'bongo "bongo" "Start Bongo by switching to a Bongo buffer." t)
diff --git a/app-emacs/bongo/files/bongo-20070619-fix-require.patch b/app-emacs/bongo/files/bongo-20070619-fix-require.patch
new file mode 100644
index 000000000000..6b3e6ff588df
--- /dev/null
+++ b/app-emacs/bongo/files/bongo-20070619-fix-require.patch
@@ -0,0 +1,11 @@
+--- bongo-orig/bongo.el 2007-06-19 16:51:37.000000000 +0200
++++ bongo/bongo.el 2008-06-22 15:30:23.000000000 +0200
+@@ -67,7 +67,7 @@
+
+ ;;; Code:
+
+-(eval-when-compile
++(eval-and-compile
+ (require 'cl)
+ (require 'rx))
+
diff --git a/app-emacs/bongo/files/bongo-20110621-texinfo-5.patch b/app-emacs/bongo/files/bongo-20110621-texinfo-5.patch
new file mode 100644
index 000000000000..3fa257b97f1c
--- /dev/null
+++ b/app-emacs/bongo/files/bongo-20110621-texinfo-5.patch
@@ -0,0 +1,12 @@
+--- bongo-orig/bongo.texinfo
++++ bongo/bongo.texinfo
+@@ -374,7 +374,8 @@
+
+ @item @kbd{C-u C-u C-u b}, @kbd{C-u C-u C-u f}
+ Seek 64 seconds.
+-@end table}.
++@end table
++}.
+ @end table
+
+ To seek a specific number of seconds, give a numeric prefix argument to
diff --git a/app-emacs/bongo/metadata.xml b/app-emacs/bongo/metadata.xml
new file mode 100644
index 000000000000..7d445f9d4045
--- /dev/null
+++ b/app-emacs/bongo/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ Bongo is a buffer-oriented media player for Emacs, contemporary with and
+ comparable to <pkg>app-emacs/emms</pkg>.
+
+ Notable features of Bongo include
+ * separate playlist and library buffers (each of which you may have any
+ number even zero of both is okay if you dont need playlist
+ functionality),
+ * hierarchical buffers with collapsable sections for each artist and album,
+ * familiar Emacs bindings for editing Bongo buffers (edit playlists much
+ like you would regular text),
+ * a nice visual seeking interface doubling as a progress meter (hit s),
+ * a visual audio volume control (<pkg>app-emacs/volume</pkg>, which is
+ actually a stand-alone package),
+ * built-in support for playing and retrieving information about audio CDs,
+ * built-in support for submitting information to Last.fm using
+ lastfmsubmitd,
+ * the ability to perform arbitrary actions (stopping playback is a simple
+ example) once playback reaches certain points in the playlist, using
+ so-called action tracks,
+ * an XMMS-like keymap for XMMS refugees,
+ * zero-configuration, out-of-the-box rocknroll action.
+
+ Bongo currently comes with backends for VLC, mpg321, ogg123, speexdec,
+ TiMidity and MikMod. All backends support pausing and resuming, but only VLC
+ and mpg321 support interactive seeking. Defining your own non-interactive
+ backends is very simple.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/boxquote-1.23 b/app-emacs/boxquote-1.23
deleted file mode 100644
index c63ceb2ed2e0..000000000000
--- a/app-emacs/boxquote-1.23
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Quote text with a semi-box
-EAPI=4
-HOMEPAGE=http://www.davep.org/emacs/
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/boxquote-1.23.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=5685256c9b4473f8248fa8c83a380f38
diff --git a/app-emacs/boxquote/Manifest b/app-emacs/boxquote/Manifest
new file mode 100644
index 000000000000..0172ce7fa628
--- /dev/null
+++ b/app-emacs/boxquote/Manifest
@@ -0,0 +1,4 @@
+AUX 50boxquote-gentoo.el 72 BLAKE2B e48064d060b7d040459abd279a36fd888d45300255c0da85f0d260972c2a682d17c07fb2697381e428b41ac3e469fa579323d7301c4b71bcca31e1469c1304d0 SHA512 d11e537a8e60f4dfc3eccae94709e382414d76cf470c5dae673d6b3b5ab34e88fa9716b58a5a2ca1d0a5673c926fc04c293484e9e53d0861520303f0a98d4b87
+DIST boxquote-1.23.el.bz2 4957 BLAKE2B d132f6f4bd6448bff498b6b8d7ad20b2295e0febff025b02d5d6bcec58d6a963749a3f0b429269fdf32e9565caf490f09b1ac6466dc251a3b7dec0b546c4333e SHA512 776835e6a21ede6e7ba82a57f381f0c9c3c740994b4d463b76d1f8a328fdf7b1b996cf6c593c3300a68fa773f1dd21b7c1a8ccc38536d5f1874973541181646d
+EBUILD boxquote-1.23.ebuild 480 BLAKE2B 7d2487b67fa7e4a14f46bc0138655ab790d1a43f067251c6cffe6630f059bb9a3644079def4be9b33ca05cff8d8aa8a50a41a3e1fe68341dc42c08a08bc641c4 SHA512 861a1c21b61a5f429d0eaf49457928f4bb62a84c583e4589bb3e0e162c8c563d667e8f7a3786334881789d11d560e1aa776a3b4cc3f06de8a02b7f449915a672
+MISC metadata.xml 854 BLAKE2B 9c00652e8f8d1fb2a28ffa47ff1c31c7f78f3e7f0ecc9a543319c65f1ef7f0b83d8bd14b6f2f494d2699a8f74ad71eb6364da50b89f2787d983cad571b7942bf SHA512 55e401b6bcb83fa4c2aef7e8204cb845a287e9f3d96405918ee96c04a4f4f6b3a78b6a3ed45467a9c55ee92ebec65e732d19f1067b1b9c1a8fdddde95cda92b6
diff --git a/app-emacs/boxquote/boxquote-1.23.ebuild b/app-emacs/boxquote/boxquote-1.23.ebuild
new file mode 100644
index 000000000000..c043cc42b678
--- /dev/null
+++ b/app-emacs/boxquote/boxquote-1.23.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Quote text with a semi-box"
+HOMEPAGE="http://www.davep.org/emacs/"
+SRC_URI="mirror://gentoo/${P}.el.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile *.el || die "elisp-compile failed"
+ elisp-make-autoload-file || die "elisp-make-autoload-file failed"
+}
diff --git a/app-emacs/boxquote/files/50boxquote-gentoo.el b/app-emacs/boxquote/files/50boxquote-gentoo.el
new file mode 100644
index 000000000000..b971ce73148a
--- /dev/null
+++ b/app-emacs/boxquote/files/50boxquote-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "boxquote-autoloads" nil t)
diff --git a/app-emacs/boxquote/metadata.xml b/app-emacs/boxquote/metadata.xml
new file mode 100644
index 000000000000..67aa86cd12e2
--- /dev/null
+++ b/app-emacs/boxquote/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ Boxquote provides a set of functions for using a text quoting style that
+ partially boxes in the left hand side of an area of text, such a marking
+ style might be used to show externally included text or example code.
+
+ ,----
+ | The default style looks like this.
+ `----
+
+ A number of functions are provided for quoting a region, a buffer, a
+ paragraph and a defun. There are also functions for quoting text while
+ pulling it in, either by inserting the contents of another file or by
+ yanking text into the current buffer.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/browse-kill-ring-1.3c b/app-emacs/browse-kill-ring-1.3c
deleted file mode 100644
index 1f7590d6ae49..000000000000
--- a/app-emacs/browse-kill-ring-1.3c
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An improved interface to kill-ring
-EAPI=4
-HOMEPAGE=https://www.emacswiki.org/emacs/BrowseKillRing https://github.com/T-J-Teru/browse-kill-ring
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/browse-kill-ring-1.3c.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=be646652641940aa5dc7128e2f3358a1
diff --git a/app-emacs/browse-kill-ring/Manifest b/app-emacs/browse-kill-ring/Manifest
new file mode 100644
index 000000000000..3680a8a92e03
--- /dev/null
+++ b/app-emacs/browse-kill-ring/Manifest
@@ -0,0 +1,4 @@
+AUX 50browse-kill-ring-gentoo.el 284 BLAKE2B 7f9d01bd6c573eb831dc9a8e4d022eacb3bb26b27b26a7654f7ed51ee1e45680be97520211d748a3501a6e93cd3a8b1fb29a0d5238b8bffb444cc504253f4b37 SHA512 64c5c2f97e97cf01874c5dd310ab9e2b913aa48b91a8d9b2d08f87c0c467658c49a3cc5a9e11e06d17820c36e425f09f0b94cc7cd850eb6c382ff25c0b2861d1
+DIST browse-kill-ring-1.3c.el.bz2 9757 BLAKE2B 3287de095f1909a7da702a12575c6ac0254c5dd4ea485007a96bcda0ac75fb9c9017a1f594b688387b7c005bb2dba2c689464730bb8ea9ff3f005a9cc02f4caa SHA512 a7244db55b08b7247047cb71aa024dd2ba8579bd1588a31d65120145228729a329dac87c268b4be14b79beded6ec4f3473542c26bfb3c5624557023369737644
+EBUILD browse-kill-ring-1.3c.ebuild 440 BLAKE2B 81a502190c3a9c2ac867e4ad90362f22484000275859015364b041afc6bc2e6c692b5cc022bc7bca81c55de12215f5e02a44c04a7271bc698b20fe6cd665fa67 SHA512 dd65ef77111cf6a241a67ad30d70a871c51956f15282de795eb3b5b5dd917b46f9ff1cc35bd45a9ae94caf951857edf64a09b8a856f982b0af2c9cf64ed5f86e
+MISC metadata.xml 787 BLAKE2B 6b958094927d6211737da88062c0116ae3b4794216361329ee7a6ae016a156c51ee67622c9e3019e31b93049d25086c5744839a1350f175f514b35baa89a41a7 SHA512 6ac913a862bcbea80b75c45a275907237dc5fbfab8cdd7ef945c70c9486cfbcb1cc49ab1ada3a03724c169acf56b757eeb28d0955d04dc61896d43f82822dd08
diff --git a/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild b/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
new file mode 100644
index 000000000000..cda01a9fd76a
--- /dev/null
+++ b/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="An improved interface to kill-ring"
+HOMEPAGE="https://www.emacswiki.org/emacs/BrowseKillRing
+ https://github.com/T-J-Teru/browse-kill-ring"
+# taken from upstream git repo
+SRC_URI="mirror://gentoo/${P}.el.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/browse-kill-ring/files/50browse-kill-ring-gentoo.el b/app-emacs/browse-kill-ring/files/50browse-kill-ring-gentoo.el
new file mode 100644
index 000000000000..b2e352d6eebd
--- /dev/null
+++ b/app-emacs/browse-kill-ring/files/50browse-kill-ring-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'browse-kill-ring "browse-kill-ring"
+ "Display items in the `kill-ring' in another buffer." t)
+(autoload 'browse-kill-ring-default-keybindings "browse-kill-ring"
+ "Set up M-y (`yank-pop') so that it can invoke `browse-kill-ring'." t)
diff --git a/app-emacs/browse-kill-ring/metadata.xml b/app-emacs/browse-kill-ring/metadata.xml
new file mode 100644
index 000000000000..0ef5057bb279
--- /dev/null
+++ b/app-emacs/browse-kill-ring/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ Are you tired of using the endless keystrokes of 'C-y M-y M-y M-y ...' to
+ get at that bit of text you killed thirty-seven kills ago? Ever wish you
+ could just look through everything you've killed recently to find out if you
+ killed that piece of text that you think you killed, but you're not quite
+ sure? If so, then browse-kill-ring.el is the emacs extension for you.
+</longdescription>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">todesschaf/browse-kill-ring</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/bubblet-0.74-r1 b/app-emacs/bubblet-0.74-r1
deleted file mode 100644
index 0425d3b71071..000000000000
--- a/app-emacs/bubblet-0.74-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A bubble-popping game
-EAPI=5
-HOMEPAGE=http://web.archive.org/web/20051217154122/www.gelatinous.com/pld/bubblet.html
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/bubblet-0.74.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=9d7df46d5874f4b531cd6b46ff4fc67f
diff --git a/app-emacs/bubblet/Manifest b/app-emacs/bubblet/Manifest
new file mode 100644
index 000000000000..d440c1130c0f
--- /dev/null
+++ b/app-emacs/bubblet/Manifest
@@ -0,0 +1,4 @@
+AUX 50bubblet-gentoo.el 98 BLAKE2B ecc975620ce677c742690b0aa0dca96c69340bf30c693d7d7167cd48512c5d5fb47c2ff6fab059f5287da121ad0665885747f58431384f1366ff00878869a93a SHA512 bfdedb262997be011e1b85c370039fc8766e61d3d1eaade21af058b5781977c1028b34db3f1ea9ddeb20299aa73a522801b0c942a91a75c6113dd96e8fc21e6a
+DIST bubblet-0.74.tar.bz2 7151 BLAKE2B 96df4bab1eb564f87f7dec24cc5e64f1aeb9ad3502a8f4ae7b9a06f4d733f293626881765531433930752265efd5852bdba8667d9fe7e9507a431ecb95dff934 SHA512 696425d7f854f83d9edf1e2fb195fbdf9a993b6758493620c9bc8e0c8bea2b94d758abf904bfebd983ff2093a25a55923964f32a1c5d47f0cb4665f3d5dda233
+EBUILD bubblet-0.74-r1.ebuild 378 BLAKE2B 9a3c0da8ae7081ab242c75a9b249a332270ea3bee16d8ebd89ecd49fe14b39bfeae17d27a1812892cbe6b5cf394d2e2f8e72737b067374fdd3062c6bb14c755b SHA512 1ffca51684a2b59694f210074900ab5f067b3bb6d579e78b7087359f951aa1172bf880ed4fdd6f708cd3ffbc316e758f35f1432107cc87ef93504fa2fb0ed5b8
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/bubblet/bubblet-0.74-r1.ebuild b/app-emacs/bubblet/bubblet-0.74-r1.ebuild
new file mode 100644
index 000000000000..039e39886182
--- /dev/null
+++ b/app-emacs/bubblet/bubblet-0.74-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A bubble-popping game"
+HOMEPAGE="http://web.archive.org/web/20051217154122/www.gelatinous.com/pld/bubblet.html"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/bubblet/files/50bubblet-gentoo.el b/app-emacs/bubblet/files/50bubblet-gentoo.el
new file mode 100644
index 000000000000..c080f3aeab7e
--- /dev/null
+++ b/app-emacs/bubblet/files/50bubblet-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'bubblet "bubblet" "Start a new Bubblet game." t)
diff --git a/app-emacs/bubblet/metadata.xml b/app-emacs/bubblet/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/bubblet/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/buffer-extension-0.1 b/app-emacs/buffer-extension-0.1
deleted file mode 100644
index cd01009c1fbc..000000000000
--- a/app-emacs/buffer-extension-0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/basic-toolkit >=virtual/emacs-23
-DESCRIPTION=Some enhanced functions for buffer manipulate
-EAPI=6
-HOMEPAGE=https://www.emacswiki.org/emacs/buffer-extension.el
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=app-emacs/basic-toolkit >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/gavv/distfiles/raw/master/buffer-extension-0.1.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=1125e52ab92d346c6b0d7d932387d58b
diff --git a/app-emacs/buffer-extension/Manifest b/app-emacs/buffer-extension/Manifest
new file mode 100644
index 000000000000..e586ca1d0e97
--- /dev/null
+++ b/app-emacs/buffer-extension/Manifest
@@ -0,0 +1,4 @@
+AUX 50buffer-extension-gentoo.el 80 BLAKE2B 8329957627093470a42d5839e03cceafbd1e9639af9c6f2b3f08cb0c53705a23926cb9e7d0c22aee7a7e7f0280fd76e80162f4037d74f30442e991f2fbd82d70 SHA512 e3f1534344a9c1cca133f93fd03024a5dd9867823358bf83beb81cadece5488054bac378fbe947c9a1f71b085381254dacc6b7e7c3a18e8ad72cebdfd41fc2d9
+DIST buffer-extension-0.1.el.xz 2472 BLAKE2B 10e6cbbe3075871c79a90dd17cd20fad15c9a12f5778758f94e6c509fdf5bb96a17ca0069c1420f53a320041ec5634034ea199e7515c8aef2c0f4808c376b259 SHA512 fef6380a7455fab534563da44868cbab2a54a793e7c86142171940b6133c4e8a9d7008c7f1297568135071eb4f1936f67ec6eea4d2f0a450be5337d97cd0139c
+EBUILD buffer-extension-0.1.ebuild 589 BLAKE2B cf13c0b54bcebf874ca7fe058a56f3b3da5e19aa571731ff813c569e51adcfc6b7581e48bf3dce5a18df774b19cbbb5de5315fb2c7209e23dc5b5f16f9c23891 SHA512 ccb5c1256284b2def4b2cfd3f0e538c75e4b2249f1c1c4f4d693eb6cdea361564103bca1989a8e6ca77a1edd36b4a68d829367dc1430e39e9065f9825c3a157a
+MISC metadata.xml 292 BLAKE2B 046265ce3ff94f04bba9b4b344d852203657df8dd300f30620df260bad1c56b3c23a8c48d073f70f571f733af9a7c034922e0465878028ee8f748060a6816ec6 SHA512 f0115ae686d3003f4264968d3aeb0b054830f87f35378e15e205a729d591c8697507d3c76ead9e1f0bab1f1f66a3fda108322dbcec7b857a37000511d1dd17df
diff --git a/app-emacs/buffer-extension/buffer-extension-0.1.ebuild b/app-emacs/buffer-extension/buffer-extension-0.1.ebuild
new file mode 100644
index 000000000000..639ac1fdc1ba
--- /dev/null
+++ b/app-emacs/buffer-extension/buffer-extension-0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Some enhanced functions for buffer manipulate"
+HOMEPAGE="https://www.emacswiki.org/emacs/buffer-extension.el"
+# taken from https://www.emacswiki.org/emacs/download/buffer-extension.el
+SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-emacs/basic-toolkit"
+DEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile *.el
+ elisp-make-autoload-file
+}
diff --git a/app-emacs/buffer-extension/files/50buffer-extension-gentoo.el b/app-emacs/buffer-extension/files/50buffer-extension-gentoo.el
new file mode 100644
index 000000000000..f8cfa55b6a0c
--- /dev/null
+++ b/app-emacs/buffer-extension/files/50buffer-extension-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "buffer-extension-autoloads" nil t)
diff --git a/app-emacs/buffer-extension/metadata.xml b/app-emacs/buffer-extension/metadata.xml
new file mode 100644
index 000000000000..c6a53b949e75
--- /dev/null
+++ b/app-emacs/buffer-extension/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/calfw-1.3 b/app-emacs/calfw-1.3
deleted file mode 100644
index af64ae8b3662..000000000000
--- a/app-emacs/calfw-1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=howm? ( app-emacs/howm ) >=virtual/emacs-23
-DESCRIPTION=A calendar framework for Emacs
-EAPI=5
-HOMEPAGE=https://github.com/kiwanami/emacs-calfw
-IUSE=howm
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=howm? ( app-emacs/howm ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/kiwanami/emacs-calfw/tarball/v1.3 -> calfw-1.3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=807579a59bc02455c0ad316b0470bad0
diff --git a/app-emacs/calfw/Manifest b/app-emacs/calfw/Manifest
new file mode 100644
index 000000000000..df7f8e3f6150
--- /dev/null
+++ b/app-emacs/calfw/Manifest
@@ -0,0 +1,4 @@
+AUX 50calfw-gentoo.el 118 BLAKE2B e5cd4b96817cc88b25d8da38f4d45f7c730feec236a4c636c5816d312a78f5689a7d076f4f53d0e1b947c536826057acb09a89cf8773ddb2752d148094adbb02 SHA512 55cf26db6805dc42f34c090214fc0d87594aacbab5d2113e26472453959a3d4f8d5bfacbf81954c14ac90aaaebc4e4fe8a6914aa31729459993de43a4347aa23
+DIST calfw-1.3.tar.gz 67187 BLAKE2B 7a8f34c5d6ad2ac245837b89c6854ca0c3c8f94733752a8c0d86e460eb2424e4017bd01b877d2b4d6b8fe05f6ffac8dae2d838d6cdf68fad489264fe861317df SHA512 76fc957dac22b2e4e41fa3d5ef3eb9e603369044d5aa90fa2e32ca0abbaa897d4537358f7849d0491c366b6a76c1b463e57e7a9483fca7c67555a8f6157f46bc
+EBUILD calfw-1.3.ebuild 583 BLAKE2B e5c48d66073091a44d799726bbc27175f86f2286f3b03724c4b4d23ab881581ac6948d5a935799617ca2a37662ee75858b556d1fefc6fe2bfe73a35a5ce60bec SHA512 13d43e409039185471fc0805bc5eac1b38731b075bc607690e93b7d74feed0aa0c3e77c5b63ff008160ad283ad0b016a0e7deabe3831d0fb0ca385a017662b7c
+MISC metadata.xml 547 BLAKE2B edaea440d5e461f1e24d022c1a2aa124b32864f759d1cca28e85d5a2ea439e6f957077a857f5887d35793eec195d60e3df5d6db3d51e9d9f99002d0f151652b9 SHA512 5738530e6d52f52b2ada1839d9bb2e4987169dd82b64e60d068de84eb2ebc4f7da80e3a32abae808dca9d631777b5411618491fe061dfcbee7c04fe7b3e1e6e5
diff --git a/app-emacs/calfw/calfw-1.3.ebuild b/app-emacs/calfw/calfw-1.3.ebuild
new file mode 100644
index 000000000000..eb7df8d8ef0e
--- /dev/null
+++ b/app-emacs/calfw/calfw-1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp eutils
+
+DESCRIPTION="A calendar framework for Emacs"
+HOMEPAGE="https://github.com/kiwanami/emacs-calfw"
+SRC_URI="https://github.com/kiwanami/emacs-calfw/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="howm"
+
+DEPEND="howm? ( app-emacs/howm )"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+ unpack ${A}
+ mv kiwanami-emacs-calfw-* ${P} || die
+}
+
+src_prepare() {
+ use howm || rm -f calfw-howm.el
+}
diff --git a/app-emacs/calfw/files/50calfw-gentoo.el b/app-emacs/calfw/files/50calfw-gentoo.el
new file mode 100644
index 000000000000..f35fde6b60c4
--- /dev/null
+++ b/app-emacs/calfw/files/50calfw-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'cfw:open-calendar-buffer "calfw" "Open a calendar buffer simply." t)
diff --git a/app-emacs/calfw/metadata.xml b/app-emacs/calfw/metadata.xml
new file mode 100644
index 000000000000..01c5781d4b61
--- /dev/null
+++ b/app-emacs/calfw/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>naota@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<use>
+ <flag name="howm">Add support for the <pkg>app-emacs/howm</pkg>
+ note-taking tool</flag>
+</use>
+<upstream>
+ <remote-id type="github">kiwanami/emacs-calfw</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/chess-2.0.4 b/app-emacs/chess-2.0.4
deleted file mode 100644
index 995f07e7a89f..000000000000
--- a/app-emacs/chess-2.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-24
-DESCRIPTION=A chess client and library for Emacs
-EAPI=5
-HOMEPAGE=https://elpa.gnu.org/packages/chess.html https://www.emacswiki.org/emacs/ChessMode
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+ FDL-1.3+
-RDEPEND=|| ( games-board/stockfish games-board/fruit games-board/gnuchess games-board/phalanx games-board/sjeng games-board/crafty ) >=virtual/emacs-24
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/chess-2.0.4.tar.xz mirror://gentoo/emacs-chess-sounds-2.0.tar.bz2 mirror://gentoo/emacs-chess-pieces-2.0.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=2194ac6c05f7510540879af6ef8162af
diff --git a/app-emacs/chess/Manifest b/app-emacs/chess/Manifest
new file mode 100644
index 000000000000..6cb79888b1a5
--- /dev/null
+++ b/app-emacs/chess/Manifest
@@ -0,0 +1,6 @@
+AUX 50chess-gentoo-2.0.4.el 1570 BLAKE2B b209711df279d0cfb7900b3acc41c0077080d8063258aa49f86cd884f4283c2bfb8403644d64a0c4914d35d6fd9d411e8bc7037cb8081868c1a8c87795978c85 SHA512 cef5a4826f0f8eb02ecbbdddb9c2d8dab54c657c42877e415262ae8474c4a591135353a31b6a56981ab7b6107f79f2aa821b7b19fa7a63b1af95f6088e5deb46
+DIST chess-2.0.4.tar.xz 364620 BLAKE2B cf02ff2734d675ac39b6b00869abe233a71af330fa60114d12092604d0173c6da5ad5c2e4cf3e2262c99cfc598abdbbe02a7df4eaadda7c628c8b9c48d8f8a8a SHA512 2c8155185878fec8b45ab84b7723f4af0f518fc81ab7534c36c09c96a9a30cb20da26c2a89320cc5a9f9d8991e4516da393e82658a7f15642929591d1b6a0e99
+DIST emacs-chess-pieces-2.0.tar.bz2 297687 BLAKE2B b97f6bbfdb4573e7a59e50431ac4ce68d2acd698ed57a2a2b9dfc83c7afdadc3ca244e8a0d55fa29eebcf7234001062606c0d21c80675864804a27d47deb6b93 SHA512 e1ee59a338b68796fd60f8693f4ff8bf20ded535c516916cc8b1f4cf00ff696ca1eead844e2a6a9a1f2578a70370d7a67cbadb6ae454ae16b2ae93864e1b1f94
+DIST emacs-chess-sounds-2.0.tar.bz2 3390098 BLAKE2B 1babc804a4ef05d4da4cb56d0829e93dfef84e703b1c56dfcbd14f941357dee68e4dffaff13b30498037f907a62c79751f53be33582ecf5c1c266d8aea492fb1 SHA512 f07894dd7a6e43450405c0eee8d1d95a08925ca8ebd5ca7e584eca45369cb2aa8eecb754b351d1977f473b520288d3e3e9a8ebe73216d14e26345b44e498efb4
+EBUILD chess-2.0.4.ebuild 1144 BLAKE2B 144737ab9beef026a6a962e25258fc34d84d35b22fff8417733753e8c6253b25f5288e0db36aed2e129f68ccb157dcedbfee261c776e376d92a2fefb98b20214 SHA512 f997352699a9ad7397a30ca873435578d2194b31eb4805a05f32005d04000e24279bd365f7a267bee53e5c0cc1d736e038b595fef876f077d28e5eed3d5bd72f
+MISC metadata.xml 1318 BLAKE2B aba8a35412d7488de868ce812c2ceccf16989e08f7d390492da8f2e74ff4550b7f1255ba7176c1eba4c5ae4c9f5050040cef93619265e6e28e425b429f52c8ad SHA512 f2baec1ee8947d0f889e58c14ac9c3414ebca90dec48d2b865f60a4d5047c408717250b72ac7169f37aeb7a2fbaaee5bd968109d922417979f7e694a2b39339a
diff --git a/app-emacs/chess/chess-2.0.4.ebuild b/app-emacs/chess/chess-2.0.4.ebuild
new file mode 100644
index 000000000000..67203f003713
--- /dev/null
+++ b/app-emacs/chess/chess-2.0.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A chess client and library for Emacs"
+HOMEPAGE="https://elpa.gnu.org/packages/chess.html
+ https://www.emacswiki.org/emacs/ChessMode"
+# Taken from https://elpa.gnu.org/packages/${P}.tar
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
+ mirror://gentoo/emacs-chess-sounds-${PV%.*}.tar.bz2
+ mirror://gentoo/emacs-chess-pieces-${PV%.*}.tar.bz2"
+
+LICENSE="GPL-3+ FDL-1.3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# Free alternatives first, otherwise follow the ordering in the upstream
+# chess-default-engine (in chess.el). Rearrange chess-default-engine in
+# the site-init file accordingly.
+RDEPEND="|| ( games-board/stockfish
+ games-board/fruit
+ games-board/gnuchess
+ games-board/phalanx
+ games-board/sjeng
+ games-board/crafty )"
+
+ELISP_REMOVE="chess-pkg.el"
+SITEFILE="50${PN}-gentoo-${PV}.el"
+DOCS="AUTHORS NEWS TODO"
+
+src_install() {
+ elisp_src_install
+ doinfo chess.info
+ insinto "${SITEETC}/${PN}"
+ doins chess-eco.fen chess-polyglot.bin
+ doins -r "${WORKDIR}"/{sounds,pieces}
+}
diff --git a/app-emacs/chess/files/50chess-gentoo-2.0.4.el b/app-emacs/chess/files/50chess-gentoo-2.0.4.el
new file mode 100644
index 000000000000..b263ddd84a02
--- /dev/null
+++ b/app-emacs/chess/files/50chess-gentoo-2.0.4.el
@@ -0,0 +1,36 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'chess "chess"
+ "Start a game of chess, playing against ENGINE (a module name)." t)
+(defalias 'chess-session 'chess)
+(autoload 'chess-create-display "chess"
+ "Create a display, letting the user's customization decide the style.")
+(autoload 'chess-link "chess-link"
+ "Play out a game between two engines, and watch the progress." t)
+(autoload 'chess-pgn-read "chess-pgn"
+ "Read and display a PGN game after point." t)
+(autoload 'chess-pgn-mode "chess-pgn"
+ "A mode for editing chess PGN files." t)
+(defalias 'pgn-mode 'chess-pgn-mode)
+(autoload 'chess-puzzle "chess-puzzle"
+ "Pick a random puzzle from FILE, and solve it against the default engine." t)
+(autoload 'chess-fischer-random-position "chess-random"
+ "Generate a Fischer Random style position.")
+(autoload 'chess-tutorial "chess-tutorial"
+ "A simple chess training display." t)
+(autoload 'chess-ics "chess-ics"
+ "Connect to an Internet Chess Server." t)
+
+(add-to-list 'auto-mode-alist '("\\.pgn\\'" . chess-pgn-mode))
+
+(setq chess-images-directory "@SITEETC@/pieces/xboard")
+(setq chess-sound-directory "@SITEETC@/sounds")
+(setq chess-eco-hash-table "@SITEETC@/chess-eco.fen")
+(setq chess-polyglot-book-file "@SITEETC@/chess-polyglot.bin")
+
+;; Change the order of the engine preference list to coincide with
+;; the order of dependencies in the ebuild. The user can override this
+;; using "M-x customize-group RET chess RET".
+(setq chess-default-engine
+ '(chess-stockfish chess-fruit chess-gnuchess chess-phalanx chess-sjeng
+ chess-crafty chess-ai))
diff --git a/app-emacs/chess/metadata.xml b/app-emacs/chess/metadata.xml
new file mode 100644
index 000000000000..8fb55ab05df2
--- /dev/null
+++ b/app-emacs/chess/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ chess.el is an Emacs Lisp library and several clients on top of the
+ underlying library functionality for performing various activities related
+ to the game of chess.
+
+ You can play against an external chess program such as gnuchess, crafty,
+ phalanx or sjeng. All of them are publically available, and chess.el will
+ automatically detect which one you have installed, provided they have
+ standard executable program names, and are in a located in a directory which
+ is part of the PATH. See the customisable variable `chess-default-engine'.
+
+ You can also play against another human or computer over the internet
+ (through a direct Emacs-to-Emacs connection, or on one of the Internet Chess
+ Servers like freechess.org or chessclub.com), or even against a very simple
+ chess thinking module implemented in pure Emacs Lisp.
+
+ chess.el also provides a mode for editing Portable Game Notation (PGN) files.
+</longdescription>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">emacs-chess</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/circe-1.3 b/app-emacs/circe-1.3
deleted file mode 100644
index 87b8bf7e33df..000000000000
--- a/app-emacs/circe-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A great IRC client for Emacs
-EAPI=5
-HOMEPAGE=https://github.com/jorgenschaefer/circe https://www.emacswiki.org/emacs/Circe
-KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/jorgenschaefer/circe/archive/circe-1.3.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=e53068bd0c5540275cec98e010046420
diff --git a/app-emacs/circe-2.7 b/app-emacs/circe-2.7
deleted file mode 100644
index 6a5eed2252f2..000000000000
--- a/app-emacs/circe-2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-24
-DESCRIPTION=A great IRC client for Emacs
-EAPI=6
-HOMEPAGE=https://github.com/jorgenschaefer/circe https://www.emacswiki.org/emacs/Circe
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-24
-SLOT=0
-SRC_URI=https://github.com/jorgenschaefer/circe/archive/v2.7.tar.gz -> circe-2.7.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=622a1229176cfeb5e2ba5ce0c3339a14
diff --git a/app-emacs/circe/Manifest b/app-emacs/circe/Manifest
new file mode 100644
index 000000000000..1d8d4123ff34
--- /dev/null
+++ b/app-emacs/circe/Manifest
@@ -0,0 +1,6 @@
+AUX 50circe-gentoo.el 84 BLAKE2B 256e2b96a42e5662222eeadfb0fe7277a09eec8119903ea6e3e9a1dfac3157e238d383051b0738b1a8d555250181db67546da50743221314a0ba1353474ad81a SHA512 3f3c92f02e0a6ee760e83b83c4685a6b7f3268d0cb99abc9be56bdee8dd794d177f865582e45e90f895d1a2d9bbdc2ce39a3a60c7fc4eb973021eab66d8dbe47
+DIST circe-1.3.tar.gz 118776 BLAKE2B 61ffc7df022be50beaba29a4025fde6d7cbde5cab28d0661e2e3388f712281f8d9370b92e8c56b4eb49984573d5a2f7edff308a7d1fe74ff630620f0867b1441 SHA512 60bbd752c73e875f2306877591ad8de324db0a7446bbfebf460e44ef19c0c28d40d08c8ed9e0caa4062859b07545d310d86380377a479eb6bc38c72decfaa213
+DIST circe-2.7.tar.gz 237375 BLAKE2B d9978cc3e0c6431dace919efbd323f90e36ce40debb6e03c955b8cdfbed60ac0bbe27c68dcebfe2df9aabd2e7198d2d6da993c2ad41b5ede0b5d1b142217ec8f SHA512 6f4e0925381ad051e4680b5413eed000a6796d2e9bef35a052464a07968f67edb19d99f74be93620359e061c044a910e35afd1f88608453d264bf37826e10af3
+EBUILD circe-1.3.ebuild 474 BLAKE2B 466b3f47e0e6124ee5d2484dbfdfa189b895cab597253066521075278fc93f29738fda684b2b2ae7dc801598845e80a731f7abff3a0bf16ab7e9d64c293cd70e SHA512 5310ba832a4652166b39247d3f7f581fb2deb99832d55e52c746dc7ff2ea183ada09b03ccfa6c0c55c81d816a412dc5681efc70e3601b975c14ebdfe6c322e07
+EBUILD circe-2.7.ebuild 537 BLAKE2B 9ea555c3500da4eda553396eed1a2b019f7e345214573c343bdb725a6427809aa2460a3fa3de3360274cf7d6ea3cec89f136a6226ae6b0285e412f87cb8193fe SHA512 3f8f4ff558f50958c3dc475fed1aa621e4d24912d325c07fde80562a332f928af64e3c9d2119c1297010b9162c2a25e6f92ee229982d71555162599e9c6db973
+MISC metadata.xml 365 BLAKE2B b725f9635d4c4b98167ccb4145c0e7c9fa32b39cf18e79e7f86e583897bb2a79bdb0aa6fc070c53ee0fd03b41685ffdb9f7636c10ff6bfc1c7244f81e4b417a1 SHA512 9e3191129263a25e6ecbf4f7252b326a1addcb110a324d9a4c277ce7a152c086f361796454174e01696be6ad3f9404628b4c9264e3bb7ac2644eb2f72c8e3657
diff --git a/app-emacs/circe/circe-1.3.ebuild b/app-emacs/circe/circe-1.3.ebuild
new file mode 100644
index 000000000000..cc6e6d9515dc
--- /dev/null
+++ b/app-emacs/circe/circe-1.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A great IRC client for Emacs"
+HOMEPAGE="https://github.com/jorgenschaefer/circe
+ https://www.emacswiki.org/emacs/Circe"
+SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+
+S="${WORKDIR}/${PN}-${P}/lisp"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="../README.md"
diff --git a/app-emacs/circe/circe-2.7.ebuild b/app-emacs/circe/circe-2.7.ebuild
new file mode 100644
index 000000000000..8367f297cab8
--- /dev/null
+++ b/app-emacs/circe/circe-2.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A great IRC client for Emacs"
+HOMEPAGE="https://github.com/jorgenschaefer/circe
+ https://www.emacswiki.org/emacs/Circe"
+SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+ELISP_REMOVE="circe-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="AUTHORS.md CONTRIBUTING.md NEWS.md README.md"
diff --git a/app-emacs/circe/files/50circe-gentoo.el b/app-emacs/circe/files/50circe-gentoo.el
new file mode 100644
index 000000000000..4c0f194ca2cf
--- /dev/null
+++ b/app-emacs/circe/files/50circe-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'circe "circe" "Connect to IRC." t)
diff --git a/app-emacs/circe/metadata.xml b/app-emacs/circe/metadata.xml
new file mode 100644
index 000000000000..750ed04302ad
--- /dev/null
+++ b/app-emacs/circe/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">jorgenschaefer/circe</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/cldoc-1.16 b/app-emacs/cldoc-1.16
deleted file mode 100644
index 11f0bd746cf8..000000000000
--- a/app-emacs/cldoc-1.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Show Common Lisp operators and variables information in echo area
-EAPI=5
-HOMEPAGE=http://homepage1.nifty.com/bmonkey/lisp/index-en.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=app-emacs/slime >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/cldoc-1.16.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=5649f4938b9311309d03cd39327db3fa
diff --git a/app-emacs/cldoc/Manifest b/app-emacs/cldoc/Manifest
new file mode 100644
index 000000000000..0c55198d2f86
--- /dev/null
+++ b/app-emacs/cldoc/Manifest
@@ -0,0 +1,4 @@
+AUX 50cldoc-gentoo.el 438 BLAKE2B a1997b6a7e5d63b5889aff5baa21d53cdb811914de505eb84864e6e76f6cdaabe722c5f8eee3569fd6bd6ca6bc4e47b794896e6e0addd63b1cffc2ba144d7234 SHA512 8b102bfb58219c061b9512a0449f2c65b92accd76d852bc5cebcd73dc55f5561cc86e690dbd4a55e244c398bdc30e9c3dade20f44201168203db9b5cfccf9844
+DIST cldoc-1.16.el.bz2 16869 BLAKE2B 5ddcb96e77be37c00cf4c2e897d3b8c7ef71aaa236258a9aacd015eca36b91708e8a174113b7b3bccdc755825817fec429c57a6294049e1fc161632a2849ad98 SHA512 6b53418252e6c139cca24768b502d58cb9d316fd5778b541306b5e7806e9ddac1d7662e099e7dd90c98932555adaeb8a7481b0a72669d5231c803818133cbacc
+EBUILD cldoc-1.16.ebuild 510 BLAKE2B f9d5c42cdaf87e25018ff5eb9bea579286a0f78d9cc30c0b37dce2375dbf44420bfe8cdac2b6ea552a40380ec70779f5ebcec8001aaad41c84733999a8cdb4b2 SHA512 bc2d9ccd0da905ffed2a934ef9c60e3b4b1b9551b7cffc8fe7575db678f82975242d42c9945b5774f5b5457657e80d11a89a7c135aa07759efff8c188e89273e
+MISC metadata.xml 830 BLAKE2B 41f5553ea0c2e9a474996402ffca352d596e49ff25b9998de64c659513290ba1b6ac6226af147b113b1878ee0515751591954a7a67eccafbc8d1f9ebfc8207a0 SHA512 386b5b7c1cf52d27508ba2c423979e8b156fad6c4478bd80d2faa9da1715d11fc6cb919219eba29ae8148bbe7d8deb1c517ffba6405321f3fd88f0b826adf3f2
diff --git a/app-emacs/cldoc/cldoc-1.16.ebuild b/app-emacs/cldoc/cldoc-1.16.ebuild
new file mode 100644
index 000000000000..10fbf9fbc056
--- /dev/null
+++ b/app-emacs/cldoc/cldoc-1.16.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Show Common Lisp operators and variables information in echo area"
+HOMEPAGE="http://homepage1.nifty.com/bmonkey/lisp/index-en.html"
+# taken from http://homepage1.nifty.com/bmonkey/emacs/elisp/cldoc.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="app-emacs/slime"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/cldoc/files/50cldoc-gentoo.el b/app-emacs/cldoc/files/50cldoc-gentoo.el
new file mode 100644
index 000000000000..79e11ea0e710
--- /dev/null
+++ b/app-emacs/cldoc/files/50cldoc-gentoo.el
@@ -0,0 +1,13 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'cldoc-mode "cldoc" nil t)
+(autoload 'turn-on-cldoc-mode "cldoc" nil t)
+(add-hook 'lisp-mode-hook 'turn-on-cldoc-mode)
+
+(add-hook 'slime-repl-mode-hook
+ #'(lambda ()
+ (turn-on-cldoc-mode)
+ (define-key slime-repl-mode-map " " nil)))
+(add-hook 'slime-mode-hook
+ #'(lambda () (define-key slime-mode-map " " nil)))
+(setq slime-use-autodoc-mode nil)
diff --git a/app-emacs/cldoc/metadata.xml b/app-emacs/cldoc/metadata.xml
new file mode 100644
index 000000000000..fa3a3cfbb4a6
--- /dev/null
+++ b/app-emacs/cldoc/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>common-lisp@gentoo.org</email>
+ <name>Gentoo Common Lisp Project</name>
+</maintainer>
+<longdescription>
+ Show Common Lisp operators and variables information in echo area.
+ cldoc.el has a database of parameters and results of Common Lisp's
+ standard functions, and syntax rules of standard macros and special
+ operators. cldoc.el automatically uses SLIME's autodoc facility if
+ available to display parameters of user defined functions and macros,
+ and the values of global variables.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/cmail-2.62-r1 b/app-emacs/cmail-2.62-r1
deleted file mode 100644
index bd39a0c5b048..000000000000
--- a/app-emacs/cmail-2.62-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A simple mail management system for Emacs
-EAPI=0
-HOMEPAGE=http://cmail.sourceforge.jp/
-IUSE=l10n_ja
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=app-emacs/apel virtual/emacs-flim app-emacs/semi >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/cmail/2191/cmail-2.62.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=c9cd281334ace0d142e2187b3255d1bd
diff --git a/app-emacs/cmail/Manifest b/app-emacs/cmail/Manifest
new file mode 100644
index 000000000000..1fc8688e2366
--- /dev/null
+++ b/app-emacs/cmail/Manifest
@@ -0,0 +1,4 @@
+AUX 70cmail-gentoo.el 115 BLAKE2B 663e1804d6d5e29ede6a7967625fa71c71e6145ac5e6a443716f483c0bad3494c84a2a52903a0638d7e20d2c2983945a1fc15045acbec75d339a42bf433e29b7 SHA512 a98b4d706dcb17d2141354131241e820efd86372988beb17bc5bfd885fc3e38fdfb9539005045e52862db6c10fe5726462ce1c03491ee77d38b1408c349600fa
+DIST cmail-2.62.tar.gz 507137 BLAKE2B b12500fe3bcb58a65436822eed057865eedfdd1ca5f91805987b61d940e187598b6edacadfff83857533b29577ff89836328d7f9fed1ae7f1bc35fcd42129816 SHA512 0b042861b6975910f281e949592bce7d83f94f6f5c78690ad7a4ecd4267b57c1e84fda0746d3018194d4e6d1a3c84a5a4c7fa172ec25027a957ad8400aff17b8
+EBUILD cmail-2.62-r1.ebuild 1367 BLAKE2B 561f184070ba732ef33f1baace3a8232191882e07b6d7e4687934bc34f4b323950420ba61493c792ffc9e46dd684376c31cf48e7a160bcf45a703af9d99ace15 SHA512 7dd33e85b0e82f8923746f10a0152da25380fbda72e6648b8cbc9845980da95b9d62c0e87bfae6d6db0c645d0a4bd41e37b0161b41361f82a7ac879f3ea43639
+MISC metadata.xml 358 BLAKE2B 82c25978008fa7f575d24d183087e22e8b4e4fc2f93a6b62410725fa8e7cfaaf8d268326eb621486cf1be23937e0eaaecbcba94ba8f4bd6ff51fd05a28b7f308 SHA512 cbef0f32344efb0caa968d4432521ddbfda1f47e3f27c9e8f930b4402f7492810cab09de740ca98c6b7f79898323b91160a120039c6735ab10910ead602a0f5e
diff --git a/app-emacs/cmail/cmail-2.62-r1.ebuild b/app-emacs/cmail/cmail-2.62-r1.ebuild
new file mode 100644
index 000000000000..99ad96798680
--- /dev/null
+++ b/app-emacs/cmail/cmail-2.62-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit elisp
+
+DESCRIPTION="A simple mail management system for Emacs"
+HOMEPAGE="http://cmail.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}/2191/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="l10n_ja"
+
+RDEPEND="app-emacs/apel
+ virtual/emacs-flim
+ app-emacs/semi"
+
+SITEFILE="70cmail-gentoo.el"
+
+src_compile() {
+ emake EMACS="${EMACS}" FLAGS="${EMACSFLAGS}" || die "emake failed"
+}
+
+src_install() {
+ emake EMACS="${EMACS}" \
+ FLAGS="${EMACSFLAGS} \
+ --eval \"(setq CMAIL_ICON_DIR \\\"${D}${SITEETC}/${PN}/icon\\\")\"" \
+ PREFIX="${D}/usr" \
+ LISPDIR="${D}/${SITELISP}" \
+ INFODIR="${D}/usr/share/info" \
+ VERSION_SPECIFIC_LISPDIR="${D}/${SITELISP}" install \
+ || die "emake install failed"
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+ dodoc ChangeLog INTRO.en README.en sample.* \
+ doc/README.{POP,gnuspop3}.en doc/cmail-r2c.en.doc || die "dodoc failed"
+
+ if use l10n_ja; then
+ dodoc README.ja RELNOTES.ja doc/FAQ \
+ doc/README.{FETCHMAIL,POP,bbdb,cmail-crypt,cvs-access} \
+ doc/README.{feedmail,folders,gnuspop3,imap4} \
+ doc/README.{multi-account,multi-highlight,nickname} \
+ doc/cmail-r2c.doc doc/glossary || die "dodoc failed"
+ else
+ rm -f "${D}"/usr/share/info/cmail.info*
+ fi
+}
diff --git a/app-emacs/cmail/files/70cmail-gentoo.el b/app-emacs/cmail/files/70cmail-gentoo.el
new file mode 100644
index 000000000000..5bc1fbb3711d
--- /dev/null
+++ b/app-emacs/cmail/files/70cmail-gentoo.el
@@ -0,0 +1,5 @@
+
+;;; cmail site-lisp configuration
+
+(setq cmail-spool-directory "/var/spool/mail")
+(autoload 'cmail "cmail" nil t)
diff --git a/app-emacs/cmail/metadata.xml b/app-emacs/cmail/metadata.xml
new file mode 100644
index 000000000000..ff41b0081242
--- /dev/null
+++ b/app-emacs/cmail/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge-jp">cmail</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/color-browser-0.3-r1 b/app-emacs/color-browser-0.3-r1
deleted file mode 100644
index 4b8da340d6fe..000000000000
--- a/app-emacs/color-browser-0.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/color-theme >=virtual/emacs-23
-DESCRIPTION=A utility for designing Emacs color themes
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/KahlilHodgson
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=app-emacs/color-theme >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/color-browser-0.3.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=84f683ae4d80a8f1c9b7806d08654798
diff --git a/app-emacs/color-browser/Manifest b/app-emacs/color-browser/Manifest
new file mode 100644
index 000000000000..04cf15e73ec8
--- /dev/null
+++ b/app-emacs/color-browser/Manifest
@@ -0,0 +1,5 @@
+AUX 0.3-gentoo.patch 2448 BLAKE2B 853507e2c5929cf47635c1f7451a8a3b7d7e4889bd07dd078436d511b699b0884c010f7b76cdaad168139bdf756c7bb50f8f97f5b3ad24595a06e0720e7b853e SHA512 5ba03d5b240c8462e932b3eca044d4af8a17a7f737a66db6605037a5bbd1f9273c5ab424da65b5d2419815fc7b8e955963bbc9d909c07560e2f6ee392fcebe2a
+AUX 60color-browser-gentoo.el 228 BLAKE2B e729f35f0b5ba9c07e4fbfbfbcd9ab8d4a187c7e2a19d532f2268db2e7fd613f344ee101b199c4c0400a49f4556b25139bfe60b67ff7f6dd83f9c5c72e5b4e17 SHA512 69eafe2006964419f61e0e37c6d0a41aea0ee29efae2161e7789a7e5b37fb634dc55dda758cbf96923172c1efc10166d9b7051d8f88a838fc0407a9f547abe8e
+DIST color-browser-0.3.tar.gz 18685 BLAKE2B ffbce159134cb896e2c9b53fd8348e7e35171392238bbb3648ceebe28811046f4e53ba435740873aeb73c83dd793b12b2429053ca4e0d7c1957caf86c90eac36 SHA512 76648adbd1dd990ec513ad9a239e6ed5ba86ce29a689e74f669b943498dadf14d019eff81a416ca574e78f031dbf14ed9b1e467a3d197ff559f75b67033ca2d3
+EBUILD color-browser-0.3-r1.ebuild 462 BLAKE2B 09d1f0e80ddad89c62a72c377f05c0c7dd26e352f97fafd12fdc398da1fffcc2ae58d144d17323e07071a6c5f0560ab4734a6254cb2f52ba31487c1ccea62fb7 SHA512 44038386c64ca1212b2fbffa0cb7318625152701e67c974a44e00646cb372595738963c6a4484c291945a2b80fdc67c52a0631f840e9e6bfaddbed2c8eb2fc8d
+MISC metadata.xml 674 BLAKE2B eb3de67925884081d23cf3e42f70173d6d0655f0de8b71d61f7b924a685f2f04b742df72a74195d34550c24964daa66d5882c08232dc52810064e850900b020e SHA512 4c42f1ebb6cbdc33ef0e411609284e632cb26db4c021d79a78d0a796d1c63afb664e3be3a6e5c4cee38f0cc41b4893a29e135b999bd118d79f765d8f0cf0e9be
diff --git a/app-emacs/color-browser/color-browser-0.3-r1.ebuild b/app-emacs/color-browser/color-browser-0.3-r1.ebuild
new file mode 100644
index 000000000000..397f6862b0c4
--- /dev/null
+++ b/app-emacs/color-browser/color-browser-0.3-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A utility for designing Emacs color themes"
+HOMEPAGE="https://www.emacswiki.org/emacs/KahlilHodgson"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="app-emacs/color-theme"
+RDEPEND="${DEPEND}"
+
+ELISP_PATCHES="${PV}-gentoo.patch"
+SITEFILE="60${PN}-gentoo.el"
diff --git a/app-emacs/color-browser/files/0.3-gentoo.patch b/app-emacs/color-browser/files/0.3-gentoo.patch
new file mode 100644
index 000000000000..8ac5c684168d
--- /dev/null
+++ b/app-emacs/color-browser/files/0.3-gentoo.patch
@@ -0,0 +1,80 @@
+--- color-browser.el.orig 2006-05-17 11:40:18.000000000 -0500
++++ color-browser.el 2006-05-17 11:38:12.000000000 -0500
+@@ -1028,7 +1028,7 @@
+ ;; make some adjustments
+
+ ;; use SYMBOL instead of my-color-theme
+- (beginning-of-buffer)
++ (goto-char (point-min))
+ (insert "(require 'color-theme)\n\n")
+ (search-forward "my-color-theme" nil t)
+ (delete-region (match-beginning 0) (match-end 0))
+@@ -1044,7 +1044,7 @@
+ (insert symbol)
+
+ ;; add a provide
+- (end-of-buffer)
++ (goto-char (point-max))
+ (insert "\n\n(provide '" symbol ")\n")
+ (save-buffer)
+ (kill-this-buffer))
+@@ -1152,7 +1152,7 @@
+ (set-marker marker point)
+ ;; un-mark the previous current face
+ (save-excursion
+- (beginning-of-buffer)
++ (goto-char (point-min))
+ (and (search-forward "[" nil t) (delete-char -1))
+ (and (search-forward "]" nil t) (delete-char -1)))
+
+@@ -1491,7 +1491,7 @@
+ palette))
+
+ ;; parse the buffer to get a list of color-names
+- (beginning-of-buffer)
++ (goto-char (point-min))
+ (while (search-forward "[DEL]" nil t)
+ (forward-char 2)
+ (setq color-names
+@@ -1708,7 +1708,7 @@
+ (forward-line -1)
+ ;; skip top line
+ (when (bobp)
+- (end-of-buffer)
++ (goto-char (point-max))
+ (forward-line -1)) ;; skip last line
+ (yank)
+ (setq header-line-format "Palette Modified")
+@@ -1724,11 +1724,11 @@
+ (select-window (posn-window (event-start click))))
+ (let ((inhibit-read-only t)
+ (kill-ring kill-ring))
+- (end-of-buffer)
++ (goto-char (point-max))
+ (forward-line -2) ;; skip last line
+ (beginning-of-line)
+ (kill-line 1)
+- (beginning-of-buffer)
++ (goto-char (point-min))
+ (forward-line 1) ;; skip top line
+ (yank)
+ (setq header-line-format "Palette Modified")
+@@ -1760,7 +1760,7 @@
+
+ (beginning-of-line)
+ ;; catch point on or after last line
+- (unless (looking-at "\\[DEL\\]") (beginning-of-buffer))
++ (unless (looking-at "\\[DEL\\]") (goto-char (point-min)))
+ ;; catch point on first line
+ (when (bobp) (forward-line 1))
+ (setq start (point))
+@@ -1980,7 +1980,8 @@
+ ))
+ (setq header-line-format nil)
+ (force-mode-line-update)
+- ))........................................................
++ ))
++;;; ........................................................
+
+ ;;;_ + Color Browser.........................................
+
diff --git a/app-emacs/color-browser/files/60color-browser-gentoo.el b/app-emacs/color-browser/files/60color-browser-gentoo.el
new file mode 100644
index 000000000000..724fc248a353
--- /dev/null
+++ b/app-emacs/color-browser/files/60color-browser-gentoo.el
@@ -0,0 +1,6 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'color-browser "color-browser"
+ "A utility for designing Emacs color themes" t)
+
+(setq cb-palettes-dir "~/color-browser/palettes/")
+(setq cb-themes-dir "~/color-browser/themes/")
diff --git a/app-emacs/color-browser/metadata.xml b/app-emacs/color-browser/metadata.xml
new file mode 100644
index 000000000000..364f09d31643
--- /dev/null
+++ b/app-emacs/color-browser/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ This package provides a tool that can (hopefully) aid in the production of
+ quality color themes. Basically it allows the user to
+ * develop sets of colors (palettes) that work well together,
+ * use those palettes to quickly select and set the properties of key face
+ groups, and
+ * save and manipulate themes and palettes under development.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/color-moccur-2.73 b/app-emacs/color-moccur-2.73
deleted file mode 100644
index b75d701e7384..000000000000
--- a/app-emacs/color-moccur-2.73
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Major mode for color moccur
-EAPI=5
-HOMEPAGE=http://www.bookshelf.jp/ https://www.emacswiki.org/emacs/SearchBuffers
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/color-moccur-2.73.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=88523ed9159a2dd28b347df8139b690c
diff --git a/app-emacs/color-moccur/Manifest b/app-emacs/color-moccur/Manifest
new file mode 100644
index 000000000000..33e216d07445
--- /dev/null
+++ b/app-emacs/color-moccur/Manifest
@@ -0,0 +1,4 @@
+AUX 50color-moccur-gentoo.el 259 BLAKE2B d09a385a19d1b0f248cb9130007b0133da099900d86b5ff9c6e1a3fbdd87badcfa1710d7e47b023bc7c08bc1421edc08db8d74918936be514880c5b4f8d8a79c SHA512 f1a28440e2f671366dcaef04a10ae79d6df93c5b5b011d4df4316d25c3e03dec95015d54417872c76cf39457b1899202d16f192f69345f28367ba31615f3fd7a
+DIST color-moccur-2.73.el.xz 22252 BLAKE2B d7d6a1ff291c44cfe4ec2597ac0f27c63d7f953f807788eca00e74d8b50910cbffcce9076b136c27d7ebbb14a3743cab40367791e7607c439854a1b6baecea6c SHA512 15ce4c9776e5a5bb273c31b8552a8f434a2a4065e874ee558ef2b9dd19ccda6f5807430e7588c4e2e1add8d0d94dba3e19be2745138ea440d4ac2705efdbf528
+EBUILD color-moccur-2.73.ebuild 452 BLAKE2B f546d02a6e62dd2ffa3f8d5ea43928cc42ef74dc31b35195c6d1c2fd2d46f0ab63d433b3a6a196a58880a577699ab03e8f86f2a57a24ed66cf1fed5169dd7f95 SHA512 6d8b3fe45dd5d9e9f7f3777ecf4dfb90dbb6118bbd37810ebfdd43dc7d99e9433cc7c11f2d023201906d636910582be44ae263ec89ce33d17a2daa33ba219e5a
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/color-moccur/color-moccur-2.73.ebuild b/app-emacs/color-moccur/color-moccur-2.73.ebuild
new file mode 100644
index 000000000000..b8db1bfbe640
--- /dev/null
+++ b/app-emacs/color-moccur/color-moccur-2.73.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Major mode for color moccur"
+HOMEPAGE="http://www.bookshelf.jp/
+ https://www.emacswiki.org/emacs/SearchBuffers"
+# taken from http://www.bookshelf.jp/elc/color-moccur.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/color-moccur/files/50color-moccur-gentoo.el b/app-emacs/color-moccur/files/50color-moccur-gentoo.el
new file mode 100644
index 000000000000..b1e2bff11c72
--- /dev/null
+++ b/app-emacs/color-moccur/files/50color-moccur-gentoo.el
@@ -0,0 +1,12 @@
+(add-to-list 'load-path "@SITELISP@")
+(mapc (function (lambda (x) (autoload x "color-moccur" nil t)))
+ '(moccur
+ dmoccur
+ dired-do-moccur
+ Buffer-menu-moccur
+ grep-buffers
+ search-buffers
+ occur-by-moccur
+ isearch-moccur
+ moccur-grep
+ moccur-grep-find))
diff --git a/app-emacs/color-moccur/metadata.xml b/app-emacs/color-moccur/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/color-moccur/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/color-theme-6.6.0-r1 b/app-emacs/color-theme-6.6.0-r1
deleted file mode 100644
index 9b7af6f17104..000000000000
--- a/app-emacs/color-theme-6.6.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Install color themes (includes many themes)
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/color-theme/
-KEYWORDS=amd64 ~arm ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases-noredirect/color-theme/color-theme-6.6.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1f178526650674e4162eefcbf31c3bd1
diff --git a/app-emacs/color-theme/Manifest b/app-emacs/color-theme/Manifest
new file mode 100644
index 000000000000..567e893b25e1
--- /dev/null
+++ b/app-emacs/color-theme/Manifest
@@ -0,0 +1,5 @@
+AUX 50color-theme-gentoo.el 4375 BLAKE2B 0a17afad7fd9290dde1992e813711d9bed4b36ec9f2a3d41ab5775dc55e125f7f3cb9b74d1230f1202ee3083b68c29782c3cba955444c04a42b31f3f66b39b89 SHA512 318354c71e75b343eaf90b3be2f94c0b6b93c776afe3289a5c18a5b837478291ce6a8d554a6357c13f14cbe568bf10c5d7ed9690ee8c382ec3cc4aeeac70412a
+AUX color-theme-6.6.0-replace-in-string.patch 1173 BLAKE2B 4e27361d5212afd78e6b94b7b20c3e2512715a280a98fcecaef3b3202ca376b5749c37c3dfb3f1d27673a3421d12de6fc0d7b6c2ee07f1720a32d737558f1e2b SHA512 bdf1ebb03c1fc70bf78adf4886b005780d1c540ac59730e644111f5a3a925b6b05d2e910520b67ec768815f0fecca3a5e617472ca9e415900daf890ca77bc6d1
+DIST color-theme-6.6.0.tar.gz 124858 BLAKE2B b98e97b6c02fa9bac30c5eaefaa1724f751e1176b99fcf10e5d44507ada0c82e2cc2df8352c6d605d097a0c3697b071c2cf9bfe32b4a8cbf67cf00dd5c1545e4 SHA512 4faa22900f6ad4a1dd57452470e23b57827d3f02bf2b9e3c4eed6f5693432d6478aa5008e67f219a95412a63fe52dbcad15b0ac7a3b4d39f1d28ceda75e5e76c
+EBUILD color-theme-6.6.0-r1.ebuild 980 BLAKE2B 77f58c6866305b87ae21e2ddead5ecf7968ef2012d961ff80a56ce4ceae65c4fb6434a91594b40299d08e7fe82b5084866b9099aa5b8b96670ff94aabb9c63be SHA512 58fb0e52f726753ebf743a464ce12bbadf8a81c32bb50247b1797fd9d60b3e5a4b64b71b8c9be6b6ec87ba0540ac7edce161445229b59386a71ccd41c59b3d13
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild b/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild
new file mode 100644
index 000000000000..c3182eaae203
--- /dev/null
+++ b/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+DESCRIPTION="Install color themes (includes many themes)"
+HOMEPAGE="http://www.nongnu.org/color-theme/"
+SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+ELISP_PATCHES="${P}-replace-in-string.patch"
+ELISP_REMOVE="color-theme-autoloads.*"
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+ elisp-install ${PN} *.el *.elc
+ elisp-install ${PN}/themes themes/*.el
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc AUTHORS BUGS ChangeLog README
+
+ DOC_CONTENTS="To use color-theme non-interactively, initialise it
+ in your ~/.emacs file as in the following example (which is
+ for the \"Blue Sea\" theme):
+ \n
+ \n(color-theme-initialize)
+ \n(color-theme-blue-sea)"
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/color-theme/files/50color-theme-gentoo.el b/app-emacs/color-theme/files/50color-theme-gentoo.el
new file mode 100644
index 000000000000..9d43c350fffd
--- /dev/null
+++ b/app-emacs/color-theme/files/50color-theme-gentoo.el
@@ -0,0 +1,109 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload (quote color-theme-select) "color-theme" "\
+Displays a special buffer for selecting and installing a color theme.
+With optional prefix ARG, this buffer will include color theme libraries
+as well. A color theme library is in itself not complete, it must be
+used as part of another color theme to be useful. Thus, color theme
+libraries are mainly useful for color theme authors." t nil)
+
+(autoload (quote color-theme-describe) "color-theme" "\
+Describe color theme listed at point.
+This shows the documentation of the value of text-property color-theme
+at point. The text-property color-theme should be a color theme
+function. See `color-themes'." t nil)
+
+(autoload (quote color-theme-install-at-mouse) "color-theme" "\
+Install color theme clicked upon using the mouse.
+First argument EVENT is used to set point. Then
+`color-theme-install-at-point' is called." t nil)
+
+(autoload (quote color-theme-install-at-point-for-current-frame) "color-theme" "\
+Install color theme at point for current frame only.
+Binds `color-theme-is-global' to nil and calls
+`color-theme-install-at-point'." t nil)
+
+(autoload (quote color-theme-print) "color-theme" "\
+Print the current color theme function.
+
+You can contribute this function to <URL:news:gnu.emacs.sources> or
+paste it into your .emacs file and call it. That should recreate all
+the settings necessary for your color theme.
+
+Example:
+
+ (require 'color-theme)
+ (defun my-color-theme ()
+ \"Color theme by Alex Schroeder, created 2000-05-17.\"
+ (interactive)
+ (color-theme-install
+ '(...
+ ...
+ ...)))
+ (my-color-theme)
+
+If you want to use a specific color theme function, you can call the
+color theme function in your .emacs directly.
+
+Example:
+
+ (require 'color-theme)
+ (color-theme-gnome2)" t nil)
+
+(autoload (quote color-theme-analyze-defun) "color-theme" "\
+Once you have a color-theme printed, check for missing faces.
+This is used by maintainers who receive a color-theme submission
+and want to make sure it follows the guidelines by the color-theme
+author." t nil)
+
+(autoload (quote color-theme-make-snapshot) "color-theme" "\
+Return the definition of the current color-theme.
+The function returned will recreate the color-theme in use at the moment." nil nil)
+
+(autoload (quote color-theme-compare) "color-theme" "\
+Compare two color themes.
+This will print the differences between installing THEME-A and
+installing THEME-B. Note that the order is important: If a face is
+defined in THEME-A and not in THEME-B, then this will not show up as a
+difference, because there is no reset before installing THEME-B. If a
+face is defined in THEME-B and not in THEME-A, then this will show up as
+a difference." t nil)
+
+(autoload (quote color-theme-install) "color-theme" "\
+Install a color theme defined by frame parameters, variables and faces.
+
+The theme is installed for all present and future frames; any missing
+faces are created. See `color-theme-install-faces'.
+
+THEME is a color theme definition. See below for more information.
+
+If you want to install a color theme from your .emacs, use the output
+generated by `color-theme-print'. This produces color theme function
+which you can copy to your .emacs.
+
+A color theme definition is a list:
+\([FUNCTION] FRAME-PARAMETERS VARIABLE-SETTINGS FACE-DEFINITIONS)
+
+FUNCTION is the color theme function which called `color-theme-install'.
+This is no longer used. There was a time when this package supported
+automatic factoring of color themes. This has been abandoned.
+
+FRAME-PARAMETERS is an alist of frame parameters. These are installed
+with `color-theme-install-frame-params'. These are installed last such
+that any changes to the default face can be changed by the frame
+parameters.
+
+VARIABLE-DEFINITIONS is an alist of variable settings. These are
+installed with `color-theme-install-variables'.
+
+FACE-DEFINITIONS is an alist of face definitions. These are installed
+with `color-theme-install-faces'.
+
+If `color-theme-is-cumulative' is nil, a color theme will undo face and
+frame-parameter settings of previous color themes." nil nil)
+
+(autoload (quote color-theme-submit) "color-theme" "\
+Submit your color-theme to the maintainer." t nil)
+
+(autoload (quote color-theme-initialize) "color-theme" "\
+Initialize the color theme package by loading color-theme-libraries." t nil)
diff --git a/app-emacs/color-theme/files/color-theme-6.6.0-replace-in-string.patch b/app-emacs/color-theme/files/color-theme-6.6.0-replace-in-string.patch
new file mode 100644
index 000000000000..bfd6bedd8983
--- /dev/null
+++ b/app-emacs/color-theme/files/color-theme-6.6.0-replace-in-string.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/280293
+
+--- color-theme-6.6.0-orig/color-theme.el 2006-05-28 15:07:29.000000000 +0200
++++ color-theme-6.6.0/color-theme.el 2009-08-10 10:17:00.000000000 +0200
+@@ -72,11 +72,6 @@
+ (string-match "XEmacs" emacs-version))
+ "Non-nil if running XEmacs.")
+
+-;; Add this since it appears to miss in emacs-2x
+-(or (fboundp 'replace-in-string)
+- (defun replace-in-string (target old new)
+- (replace-regexp-in-string old new target)))
+-
+ ;; face-attr-construct has a problem in Emacs 20.7 and older when
+ ;; dealing with inverse-video faces. Here is a short test to check
+ ;; wether you are affected.
+@@ -1626,9 +1621,10 @@
+ (add-to-list 'color-themes
+ (list ',n
+ (upcase-initials
+- (replace-in-string
+- (replace-in-string
+- (symbol-name ',n) "^color-theme-" "") "-" " "))
++ (replace-regexp-in-string
++ "-" " "
++ (replace-regexp-in-string
++ "^color-theme-" "" (symbol-name ',n))))
+ ,author))
+ (defun ,n ()
+ ,description
diff --git a/app-emacs/color-theme/metadata.xml b/app-emacs/color-theme/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/color-theme/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/company-mode-0.6.14 b/app-emacs/company-mode-0.6.14
deleted file mode 100644
index 1a4d00c794b5..000000000000
--- a/app-emacs/company-mode-0.6.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=ropemacs? ( app-emacs/pymacs ) >=virtual/emacs-23
-DESCRIPTION=In-buffer completion front-end
-EAPI=5
-HOMEPAGE=https://company-mode.github.com/
-IUSE=ropemacs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=ropemacs? ( app-emacs/pymacs ) ropemacs? ( dev-python/ropemacs ) >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/company-mode/company-mode/archive/0.6.14.tar.gz -> company-mode-0.6.14.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=67897dab04be20a955654811f546d4a3
diff --git a/app-emacs/company-mode-0.7 b/app-emacs/company-mode-0.7
deleted file mode 100644
index 1a57cbc5b720..000000000000
--- a/app-emacs/company-mode-0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=ropemacs? ( app-emacs/pymacs ) >=virtual/emacs-23
-DESCRIPTION=In-buffer completion front-end
-EAPI=5
-HOMEPAGE=https://company-mode.github.com/
-IUSE=ropemacs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=ropemacs? ( app-emacs/pymacs ) ropemacs? ( dev-python/ropemacs ) >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/company-mode/company-mode/archive/0.7.tar.gz -> company-mode-0.7.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=67897dab04be20a955654811f546d4a3
diff --git a/app-emacs/company-mode/Manifest b/app-emacs/company-mode/Manifest
new file mode 100644
index 000000000000..d947103e5326
--- /dev/null
+++ b/app-emacs/company-mode/Manifest
@@ -0,0 +1,6 @@
+AUX 50company-mode-gentoo.el 79 BLAKE2B c9b00690d98498b53fa329adf5279ee341c03c73cfd12b70e1474189cc9c9de07bca276ef9fad35f346825c4daab0212e8965069a2a0706cec690350df24fbf7 SHA512 8c3c1d4a50bfd4729f8a06f33bf9d754b5865814cf15eee1f3c84c6726734f8ff26c21547f1453f7417a0b9d008fe7804104ee6e30f13c54625d2b4b6faa7e99
+DIST company-mode-0.6.14.tar.gz 51776 BLAKE2B 2e5a651b13d959d964847a307814106b5db95092d764e1d6889c94412d0aa1995d2a34182786493afc426b6c6ae4f229498f58b7556d1dc264c71ec57dcb8b6f SHA512 7b8c0b70dc9c010214e8671fd7393faa9d1dd0839f41d532eb93eda91c77b4c93f2145ad2d688011976bfbb45282f35b937f195499f29cda79147ec2815e94d9
+DIST company-mode-0.7.tar.gz 54670 BLAKE2B 4b56182d6d37e1c0dd827babf3e5c17c49a2e86959c99aa4dc6832f5003a9c1baf0019c610cf9bd46e6db5f1d68e72381ae22f71afb636873552440c48b218c0 SHA512 375c8541a0c5b34fba37ea136c8549e6ec916c238bee8115f036d88f273d6bcb0c0f436a6193d3b4be6528945d8f85c605de8d340e903a9764f5ace664f8cf61
+EBUILD company-mode-0.6.14.ebuild 1000 BLAKE2B 51b71a2a2d7988421156b6b415b935bfe153fd076d83904f6762cd02aed3c7b1318b228b0c960160cf4c640f37d51c5334877f24e4d5ef0fe49f2d36dd355416 SHA512 62fced23f0b40ab4d4b93c2102202c00e7dc85d4541cdbbea9bd78d65d71b07d301700fa944d2729d0e59f2537e10fece36509daf0666179158acb0293c10804
+EBUILD company-mode-0.7.ebuild 1000 BLAKE2B 51b71a2a2d7988421156b6b415b935bfe153fd076d83904f6762cd02aed3c7b1318b228b0c960160cf4c640f37d51c5334877f24e4d5ef0fe49f2d36dd355416 SHA512 62fced23f0b40ab4d4b93c2102202c00e7dc85d4541cdbbea9bd78d65d71b07d301700fa944d2729d0e59f2537e10fece36509daf0666179158acb0293c10804
+MISC metadata.xml 469 BLAKE2B 08b950e54425d9c6fd0f2a58eea8aced42d9d7c0f657e34e950b3fd618af534900970356be21750adf7886e7fba34a041f5445e60f247dab4c763dc59d0c8f86 SHA512 e5da67fd1ae2089c6ba90c7bdc223c11e3e6e4eaf548dee77198a5ecadcd288aa2f91dccbda9bcfcbc347909d77f5a1acd77ce22b45efaab8f9c62729407713b
diff --git a/app-emacs/company-mode/company-mode-0.6.14.ebuild b/app-emacs/company-mode/company-mode-0.6.14.ebuild
new file mode 100644
index 000000000000..7b2e2231f50f
--- /dev/null
+++ b/app-emacs/company-mode/company-mode-0.6.14.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="In-buffer completion front-end"
+HOMEPAGE="https://company-mode.github.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ropemacs"
+RESTRICT="test"
+
+# Note: company-mode supports many backends, and we refrain from including
+# them all in RDEPEND. Only depend on things that are needed at build time.
+DEPEND="ropemacs? ( app-emacs/pymacs )"
+RDEPEND="${DEPEND}
+ ropemacs? ( dev-python/ropemacs )"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md NEWS.md"
+
+src_prepare() {
+ # Disable backends that require extra dependencies, unless they are
+ # selected by the respective USE flag
+
+ elog "Removing pysmell backend"
+ rm company-pysmell.el || die
+
+ if ! use ropemacs; then
+ elog "Removing ropemacs backend, as requested by USE=-ropemacs"
+ rm company-ropemacs.el || die
+ fi
+}
diff --git a/app-emacs/company-mode/company-mode-0.7.ebuild b/app-emacs/company-mode/company-mode-0.7.ebuild
new file mode 100644
index 000000000000..7b2e2231f50f
--- /dev/null
+++ b/app-emacs/company-mode/company-mode-0.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="In-buffer completion front-end"
+HOMEPAGE="https://company-mode.github.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ropemacs"
+RESTRICT="test"
+
+# Note: company-mode supports many backends, and we refrain from including
+# them all in RDEPEND. Only depend on things that are needed at build time.
+DEPEND="ropemacs? ( app-emacs/pymacs )"
+RDEPEND="${DEPEND}
+ ropemacs? ( dev-python/ropemacs )"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md NEWS.md"
+
+src_prepare() {
+ # Disable backends that require extra dependencies, unless they are
+ # selected by the respective USE flag
+
+ elog "Removing pysmell backend"
+ rm company-pysmell.el || die
+
+ if ! use ropemacs; then
+ elog "Removing ropemacs backend, as requested by USE=-ropemacs"
+ rm company-ropemacs.el || die
+ fi
+}
diff --git a/app-emacs/company-mode/files/50company-mode-gentoo.el b/app-emacs/company-mode/files/50company-mode-gentoo.el
new file mode 100644
index 000000000000..cd85457fe91e
--- /dev/null
+++ b/app-emacs/company-mode/files/50company-mode-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'company-mode "company" nil t)
diff --git a/app-emacs/company-mode/metadata.xml b/app-emacs/company-mode/metadata.xml
new file mode 100644
index 000000000000..166418c6cfac
--- /dev/null
+++ b/app-emacs/company-mode/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<use>
+ <flag name="ropemacs">Install backend for
+ <pkg>dev-python/ropemacs</pkg></flag>
+</use>
+<upstream>
+ <remote-id type="github">company-mode/company-mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/crontab-mode-1.20 b/app-emacs/crontab-mode-1.20
deleted file mode 100644
index f394354be946..000000000000
--- a/app-emacs/crontab-mode-1.20
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Mode for editing crontab files
-EAPI=5
-HOMEPAGE=http://www.mahalito.net/~harley/elisp/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/crontab-mode-1.20.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=20eed63c32d49e35eff076b103006f65
diff --git a/app-emacs/crontab-mode/Manifest b/app-emacs/crontab-mode/Manifest
new file mode 100644
index 000000000000..2c624c47329f
--- /dev/null
+++ b/app-emacs/crontab-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50crontab-mode-gentoo.el 129 BLAKE2B 50c24f009ea6ccfac27feb5bdfa037bb667d3de5c18cc1efe98244903852d7eec3dbfcda716c02d5aab003f1d5ecb636529a04c429971fd9e26a6cae93cecfa8 SHA512 2af43fd17dfdc0814fabd07e7917efaba1490fede5c3f6357766e41eaefb75ca6d4043f0d9e1e2936595a4861644666f1f400e0dc6e2c93981f57e9fbfe528ba
+DIST crontab-mode-1.20.tar.bz2 2617 BLAKE2B 39c29c077977f0776f71784ee3daf09cf67a8bf9bf300702ff3ee6ea809bdf4d7c8019613d897320f19e32bbd718e4b0c92d14a748384ab8d02e3643bbd3ad6f SHA512 30588baca16a46c2dd079bce12386324ccf26eb50e7a99c8e824704a399d0a7f34b425c5732a196a5e5655b242d243a02fdc816abbdfaaaaa87f983e4846cbf4
+EBUILD crontab-mode-1.20.ebuild 360 BLAKE2B b1a57604d6f4820ca6a2c44cf24257336cc6316c380e2a04809b5fc9496b692a529e3d570d302dbe74fd7863c42edde31eeb1539b085f16eabdf15ae79778a0c SHA512 a35edb12bd1f46fc796e38f13e2b60c95d67aabfdf26fcfa0ee69997bc9f4dfaba7fe1cf5a084dd086a50e4e02b2e9c5689ce6ccf0252b1d30cc6393a5a23dd2
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/crontab-mode/crontab-mode-1.20.ebuild b/app-emacs/crontab-mode/crontab-mode-1.20.ebuild
new file mode 100644
index 000000000000..ee7e6897f56b
--- /dev/null
+++ b/app-emacs/crontab-mode/crontab-mode-1.20.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Mode for editing crontab files"
+HOMEPAGE="http://www.mahalito.net/~harley/elisp/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2" # GPL-2 only
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/crontab-mode/files/50crontab-mode-gentoo.el b/app-emacs/crontab-mode/files/50crontab-mode-gentoo.el
new file mode 100644
index 000000000000..b2100eb15cb5
--- /dev/null
+++ b/app-emacs/crontab-mode/files/50crontab-mode-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'crontab-mode "crontab-mode" nil t)
+(autoload 'crontab-get "crontab-mode" nil t)
diff --git a/app-emacs/crontab-mode/metadata.xml b/app-emacs/crontab-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/crontab-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/crypt++-2.92 b/app-emacs/crypt++-2.92
deleted file mode 100644
index 9f55aaf01a4b..000000000000
--- a/app-emacs/crypt++-2.92
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Handle all sorts of compressed and encrypted files
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/CryptPlusPlus
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://debian/pool/main/c/crypt++el/crypt++el_2.92.orig.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=4aed8484b69e882ca00d5dea4bd9a32f
diff --git a/app-emacs/crypt++-2.94_pre20080430 b/app-emacs/crypt++-2.94_pre20080430
deleted file mode 100644
index d84571e6d001..000000000000
--- a/app-emacs/crypt++-2.94_pre20080430
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Handle all sorts of compressed and encrypted files
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/CryptPlusPlus
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/crypt++-2.94_pre20080430.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=f58e55ff624a1d04965eea2ef384ec98
diff --git a/app-emacs/crypt++/Manifest b/app-emacs/crypt++/Manifest
new file mode 100644
index 000000000000..216e11547624
--- /dev/null
+++ b/app-emacs/crypt++/Manifest
@@ -0,0 +1,6 @@
+AUX 50crypt++-gentoo.el 57 BLAKE2B 5e62ba7f3832ceed74ecbc3680442bfe260f2a7244416016cbce58e6105aabe0d30747b57671804d8c38b75fa90fc53db3d0497108507f1859f265925c2492ab SHA512 3e7407aff3b5639f78eba1af624a370316488b33e824138a55965537eebbdeb929a4b65d8f9cef23f414fa8509abf19e951eb71b8f1ad2e9b809a5590c15fbfc
+DIST crypt++-2.94_pre20080430.el.bz2 28692 BLAKE2B 2b7f227b87b16fc6b3fdfdb62059a55c70ee95008a144bc7ec0e8c3f5699ec2ba14989b8ae2da3fa7c4bb56070eac7ea1755caddfd27e6c2a53e8a62068ca6cc SHA512 8e142840f8e2db4688e9ce4432ee14db4225899a88a35dea3e371f829ccfc24faa34c607517e344e7706bf75126d758b0490dd5324efa43d4649de127076a5ce
+DIST crypt++el_2.92.orig.tar.gz 34251 BLAKE2B 579d44269ec84a9548e9e4cb845601027be3862f2f56a2ab99b3c46155f6839c7e5b9426c97ea12ac936df62fb533f5424de8afc7df6983f339eb166b6df6486 SHA512 d3abf169f60c3d1a270149b800d96f7132ebeb99b6952858b81cb2c05ffdce30f6c46f75723490731c47e7eb44515554e012da98351bbd9f9127dcba8453e389
+EBUILD crypt++-2.92.ebuild 447 BLAKE2B becd2bd3c43b622e13590a021252bca5ece53dfd1e0e3510f52f8977e094ef7b37fc3034d1b6e3e2270813a704473cb000e9901731dc0ae40d0af154089ba109 SHA512 c23ad4ce87ecf9954b93df6ab1d3cb8fa1a5c6c389867ec72f45b00d2c84bfcea4797ecb4b24345362083b4be8256cb51b4eef88cee267f988a754600f4cbaa9
+EBUILD crypt++-2.94_pre20080430.ebuild 505 BLAKE2B de2acd1603001914b78c43b906268b5085743918788c8eaaa7bae8d23ece9c32dc89002e3f2b873bdf296da0948b7b955417281d687d71df3856c9c44b8f560b SHA512 c7608028665138365b308a9d146f251f47bee2d82ea67ff6a324c8be8248796da1b8988c1e5670376088eb3dabb4a5aab00654ed1706feedd0faf2bee4b1992f
+MISC metadata.xml 759 BLAKE2B 493432cd932a42c0a22d3bfbd2d93bcfa13c1605e1f35e613e1f400bd06803473a0d9a4442bc80926e27661b046523606b3b63da750a58c54f06ac4523bfee12 SHA512 212f1940a5100f7d8f94470512c25e8ddd2f0fbf6089a650d7a18fe43cc525cbdf44e3dd905f4f5af798328a31edc2e76f39285d49c4f085c47ae5bd18a29f67
diff --git a/app-emacs/crypt++/crypt++-2.92.ebuild b/app-emacs/crypt++/crypt++-2.92.ebuild
new file mode 100644
index 000000000000..f28ba6418631
--- /dev/null
+++ b/app-emacs/crypt++/crypt++-2.92.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Handle all sorts of compressed and encrypted files"
+HOMEPAGE="https://www.emacswiki.org/emacs/CryptPlusPlus"
+SRC_URI="mirror://debian/pool/main/c/crypt++el/crypt++el_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+
+S="${WORKDIR}/${PN}el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/crypt++/crypt++-2.94_pre20080430.ebuild b/app-emacs/crypt++/crypt++-2.94_pre20080430.ebuild
new file mode 100644
index 000000000000..b534e837c5d5
--- /dev/null
+++ b/app-emacs/crypt++/crypt++-2.94_pre20080430.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Handle all sorts of compressed and encrypted files"
+HOMEPAGE="https://www.emacswiki.org/emacs/CryptPlusPlus"
+# snapshot from http://cvs.xemacs.org/viewcvs.cgi/XEmacs/packages/xemacs-packages/os-utils/crypt.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/crypt++/files/50crypt++-gentoo.el b/app-emacs/crypt++/files/50crypt++-gentoo.el
new file mode 100644
index 000000000000..0009afdeff1c
--- /dev/null
+++ b/app-emacs/crypt++/files/50crypt++-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'crypt++)
diff --git a/app-emacs/crypt++/metadata.xml b/app-emacs/crypt++/metadata.xml
new file mode 100644
index 000000000000..59c5f3e28e24
--- /dev/null
+++ b/app-emacs/crypt++/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ crypt++.el is a package of Lisp functions that recognize automatically
+ encrypted and encoded (i.e., compressed) files when they are first visited
+ or written. The BUFFER corresponding to the file is decoded and/or decrypted
+ before it is presented to the user. The file itself is unchanged on the
+ disk. When the buffer is subsequently saved to disk, a hook function
+ re-encodes the buffer before the actual disk write takes place.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/csharp-mode-0.7.0-r1 b/app-emacs/csharp-mode-0.7.0-r1
deleted file mode 100644
index 7325a768aa88..000000000000
--- a/app-emacs/csharp-mode-0.7.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A derived Emacs mode implementing most of the C# rules
-EAPI=5
-HOMEPAGE=http://mfgames.com/csharp-mode/start
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://mfgames.com/releases/csharp-mode/csharp-mode-0.7.0.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=9ba3dd4c977e2bc9859b7af896b5c651
diff --git a/app-emacs/csharp-mode-0.9.0 b/app-emacs/csharp-mode-0.9.0
deleted file mode 100644
index 52591d77a53f..000000000000
--- a/app-emacs/csharp-mode-0.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A derived Emacs mode implementing most of the C# rules
-EAPI=6
-HOMEPAGE=https://github.com/josteink/csharp-mode
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/josteink/csharp-mode/archive/v0.9.0.tar.gz -> csharp-mode-0.9.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=6866f35edbe30391a54f6474bd9c79ed
diff --git a/app-emacs/csharp-mode/Manifest b/app-emacs/csharp-mode/Manifest
new file mode 100644
index 000000000000..96d6c3f5ecb1
--- /dev/null
+++ b/app-emacs/csharp-mode/Manifest
@@ -0,0 +1,7 @@
+AUX 50csharp-mode-gentoo.el 171 BLAKE2B 6fa14f46d3ea4fba310ad4cb59a037ed5a4f123cc5b9243db715e08d3301bad7f24abb4cf1aa3ec178ad9c8e859d5225f49a3c8b87a302ac50c7a30eb56a34a1 SHA512 e0c9a5dc17c849ce9619a75ee46a0eb7415c0c04cb71cef326845ec9fdd79f57abf397590ba85bb0b901103ba0815cd6c873e9e12670cfb97d796b1f2cef087a
+AUX csharp-mode-0.7.0-emacs-24.4.patch 393 BLAKE2B 7eb176fa02441f9b5d42fd6ff68c3079d1fc047b6d84419725693b545402963a2fb14447be9843bc705026a06f65e104d582ed4bacec0d64b52ef06bef03f8b8 SHA512 b7b0a337a1b0d615f92b86ad27c09274ec63e87795629778b9091307fa6fa7bdaea2efe01cacadff2b47ccafd43ee0445f883f2f8a0b8f225fb727488c5752e3
+DIST csharp-mode-0.7.0.tar.bz2 6254 BLAKE2B 259d3ab7a6005428043398d44068dd8accc222c50581b7a760c740af96275a5877efc186d2582dccdc73442b9549bc8f5e1ff7f95e69effa7c90bbffc46fe461 SHA512 b6cbf2899853c29f44d19f37a01984a03c61f7bde144880f6f32e2a890d3b90a546ff69ad328d157e5494191aed37836373f49ddbafac49d8b9bd1cea3e22de9
+DIST csharp-mode-0.9.0.tar.gz 50453 BLAKE2B ed4b6ba56a9283687db332749510dcb63cc4bfc35687979cabae48b76d9e36598c88ff43f2920ca5272b56833d5cadd6602b47be21d88a7cd25d6ecb0e748493 SHA512 81661d98acdf03e01caf3b9388da8571e78402b8914755b223a38a723457a988201adcaf7b5b825c4e0126ad5e7628063f85dd4e60ee272102a5f1509f9446ef
+EBUILD csharp-mode-0.7.0-r1.ebuild 426 BLAKE2B 726cd422b98165f0eb2f4da36391a9360676919c152194521ca7f7df8e21eeaac6313bdee28c01a2faab3fde504ddf6e61653e475f1c1bac49630cb91c8130f2 SHA512 5d4eb1347e3f6d6c4d4c25a54c2c1f08bea882296cdb8af907a315cae6dbe03d76536ba3fb6d563218ba26ded56850bae1465506aeedd9b8b79bb41552d2f63d
+EBUILD csharp-mode-0.9.0.ebuild 543 BLAKE2B c5ae548cd6b28a0e081a487f65f1e5942c9cb87e4a7bf13634c83d861009a80750907c0889ac7a8f90c8ad1f1ae7e9d307fd3a4e8220c8bba936e68572feb340 SHA512 21fd7b3183af0ec291b2406384050b7c07d07bcde4e2d0e2a6129357f1d5352000d2a0278a3b258ce75d8db4508498bf4991b99d56ae08b99872cdc202cd7ca4
+MISC metadata.xml 381 BLAKE2B 24f06d9590b0aefd84fe951957813fdcbd1821fa8ee7878a6f34e0aacd51c603a93ca0e91da14bbe58ab6239c8c38e59c0a17d8162ca478ea5ad832536b22ffa SHA512 4c03424612532509c84b60d2058272ca830b6532dfcc6a179324236b30f9edd2e7924cebdf1803f4fb7d7adbe94ff59c065d605534c375c2bf4c0919356303e0
diff --git a/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild b/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..6346e99d8da1
--- /dev/null
+++ b/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A derived Emacs mode implementing most of the C# rules"
+HOMEPAGE="http://mfgames.com/csharp-mode/start"
+SRC_URI="http://mfgames.com/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+ELISP_PATCHES="${P}-emacs-24.4.patch"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/csharp-mode/csharp-mode-0.9.0.ebuild b/app-emacs/csharp-mode/csharp-mode-0.9.0.ebuild
new file mode 100644
index 000000000000..e73197cf3cc8
--- /dev/null
+++ b/app-emacs/csharp-mode/csharp-mode-0.9.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="A derived Emacs mode implementing most of the C# rules"
+HOMEPAGE="https://github.com/josteink/csharp-mode"
+SRC_URI="https://github.com/josteink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+ elisp-install ${PN} csharp-mode.el{,c}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc README.org
+}
diff --git a/app-emacs/csharp-mode/files/50csharp-mode-gentoo.el b/app-emacs/csharp-mode/files/50csharp-mode-gentoo.el
new file mode 100644
index 000000000000..ea2056b6a29d
--- /dev/null
+++ b/app-emacs/csharp-mode/files/50csharp-mode-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'csharp-mode "csharp-mode" "Major mode for editing C# code." t)
+(add-to-list 'auto-mode-alist '("\\.cs\\'" . csharp-mode))
diff --git a/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch b/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch
new file mode 100644
index 000000000000..c3f73201cbae
--- /dev/null
+++ b/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/528374
+
+--- a/csharp-mode.el
++++ b/csharp-mode.el
+@@ -125,6 +125,9 @@
+ (stringp byte-compile-dest-file))
+ (cons (file-name-directory byte-compile-dest-file) load-path)
+ load-path)))
++ (and (= emacs-major-version 24)
++ (>= emacs-minor-version 4)
++ (require 'cl))
+ (load "cc-mode" nil t)
+ (load "cc-fonts" nil t)
+ (load "cc-langs" nil t)))
diff --git a/app-emacs/csharp-mode/metadata.xml b/app-emacs/csharp-mode/metadata.xml
new file mode 100644
index 000000000000..a4bcf30f6751
--- /dev/null
+++ b/app-emacs/csharp-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <stabilize-allarches/>
+ <upstream>
+ <remote-id type="github">josteink/csharp-mode</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-emacs/css-mode-0.11-r1 b/app-emacs/css-mode-0.11-r1
deleted file mode 100644
index ee85bab661d3..000000000000
--- a/app-emacs/css-mode-0.11-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A major mode for editing Cascading Style Sheets (CSS)
-EAPI=5
-HOMEPAGE=http://www.garshol.priv.no/download/software/css-mode/
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/css-mode-0.11.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=f7443342a076810d5d14663373a0bae1
diff --git a/app-emacs/css-mode/Manifest b/app-emacs/css-mode/Manifest
new file mode 100644
index 000000000000..1bb3fe3b19f4
--- /dev/null
+++ b/app-emacs/css-mode/Manifest
@@ -0,0 +1,5 @@
+AUX 50css-mode-gentoo.el 171 BLAKE2B 031ee725bb003a73a9aa98d35b4f8fd0fdc853e81c23f93ae69ba64ab24590e6ce22df442ac6ad4e1651f5a543b5885b0d661c47b7b11514df4fc2b8f355f7c6 SHA512 18713c42439aa4d076b7154035ba369060bfc8a0e98e845b7140e137b05ed0aacc2a25ec93612e950fe930c5605d6ea909d5d1ed79433d1472f357bc272ce96e
+AUX css-mode-0.11-no-compat-kbd.patch 875 BLAKE2B 587f49af1b892522d94ed10d41ad2555f078c41d02d4ad0fce0c1643b5449ce49a2dffed8181f8e60949e36a481a7fd5795fff7c9b63aec8330e5db6baa6bc8b SHA512 27f298f89cc15c2104fe27712f0a02676074fcdd8417ec8cc515ab461e27aec63d6325fdfe4c269c4212fa4c2e12975dcfe7d7eb345b2f31a4d12dc0189c523b
+DIST css-mode-0.11.tar.bz2 6848 BLAKE2B f5110cb5e1db9cddd47372dd8ba180892b9d9a5999643832227fb710089c08526eb077393350440ac30d2860a84dd821368323a528ce2056ca82a890399302ed SHA512 b93574fde8bb24ffc4dac6ddda20db3ec3c1834c1201f250f24805d31c7972edc2ffc157e7717327e7baac5c71a1d943a9d80bc7bec96be99c44cd2ab16e0e03
+EBUILD css-mode-0.11-r1.ebuild 653 BLAKE2B eab51857c0a3d22abdb30c0b8ff6c7689da3d3a5c8ce4d355e80d9c2c118c41dffb20785c537555c08267f14b71947ae0f5ec4ec4ae4db154c92fcf7c04a9cba SHA512 e9ac0302ff44318e44a3ea22df34d08371ca8920151ebec9681d4341a93bdbc1cb4327437bdfafa28b6eb4c97318cc934cdf189b60c592e2e8a0940154051519
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/css-mode/css-mode-0.11-r1.ebuild b/app-emacs/css-mode/css-mode-0.11-r1.ebuild
new file mode 100644
index 000000000000..25c3581915e4
--- /dev/null
+++ b/app-emacs/css-mode/css-mode-0.11-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A major mode for editing Cascading Style Sheets (CSS)"
+HOMEPAGE="http://www.garshol.priv.no/download/software/css-mode/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+
+ELISP_PATCHES="${P}-no-compat-kbd.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+ # Fix documentation
+ sed -i -e 's,HREF="/visuals/standard.css",HREF="standard.css",' doco.html
+}
+
+src_install() {
+ elisp_src_install
+ dohtml -A css doco.html standard.css
+}
diff --git a/app-emacs/css-mode/files/50css-mode-gentoo.el b/app-emacs/css-mode/files/50css-mode-gentoo.el
new file mode 100644
index 000000000000..8559be036db5
--- /dev/null
+++ b/app-emacs/css-mode/files/50css-mode-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'auto-mode-alist '("\\.css\\'" . css-mode))
+(autoload 'css-mode "css-mode" "Mode for editing Cascading Style Sheets" t)
diff --git a/app-emacs/css-mode/files/css-mode-0.11-no-compat-kbd.patch b/app-emacs/css-mode/files/css-mode-0.11-no-compat-kbd.patch
new file mode 100644
index 000000000000..858cb238bf3c
--- /dev/null
+++ b/app-emacs/css-mode/files/css-mode-0.11-no-compat-kbd.patch
@@ -0,0 +1,24 @@
+Function "apropos-macrop" apparently no longer exists in Emacs 24.4.
+Simply remove the code using it, since it was only needed for backwards
+compatibility with Emacs 19 (the "kbd" macro appeared in Emacs 20.1).
+https://bugs.gentoo.org/532358
+
+--- css-mode-0.11-orig/css-mode.el
++++ css-mode-0.11/css-mode.el
+@@ -166,16 +166,6 @@
+ (define-key cssm-mode-map (read-kbd-macro "}") 'cssm-insert-right-brace-and-indent)
+ (define-key cssm-mode-map (read-kbd-macro "M-TAB") 'cssm-complete-property))
+
+-;;; Cross-version compatibility layer
+-
+-(when (not (or (apropos-macrop 'kbd)
+- (fboundp 'kbd)))
+- (defmacro kbd (keys)
+- "Convert KEYS to the internal Emacs key representation.
+-KEYS should be a string constant in the format used for
+-saving keyboard macros (see `insert-kbd-macro')."
+- (read-kbd-macro keys)))
+-
+ ;;; Auto-indentation support
+
+ ; internal
diff --git a/app-emacs/css-mode/metadata.xml b/app-emacs/css-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/css-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/csv-mode-1.50 b/app-emacs/csv-mode-1.50
deleted file mode 100644
index f2cbf70d4ad3..000000000000
--- a/app-emacs/csv-mode-1.50
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A major mode for editing comma-separated value files
-EAPI=5
-HOMEPAGE=http://centaur.maths.qmw.ac.uk/Emacs/
-KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/csv-mode-1.50.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=7389fadcab84aae669fa7a7694f5cd0e
diff --git a/app-emacs/csv-mode/Manifest b/app-emacs/csv-mode/Manifest
new file mode 100644
index 000000000000..15f11281918e
--- /dev/null
+++ b/app-emacs/csv-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50csv-mode-gentoo.el 194 BLAKE2B 6232d9d6d6989647532b496f8c3304b256cd04ec12530a93518621094cc3c652a855dc822059df08ba5d4f6478017888978c5c5c11a495d2afb869dc9a0383dd SHA512 8aa137123c8eccc7551c946e7925ff3a54364acba46d29f401f96330ce97fff289f61e0544db4ed45ce677691d0fca5ed8302587ff4280ba8ff9906f58fec890
+DIST csv-mode-1.50.tar.gz 14379 BLAKE2B 8b3b60414aa8d6c54f18a0452c1f0d7ea4cb85311392f928e3ec99555b91cd9e7a47e4315b07df3970acf4c05b05b85e1a4e2e7b87b3bb8527904003f89ade75 SHA512 f62e9561f3ec9c14d0fc44de92f83b733ab86e45ba4b8919e5dbbee05d25a346cf7f1412aa0c5be7e88079d219dd4c22d6e198f4e53f801ae1b137e014a7943c
+EBUILD csv-mode-1.50.ebuild 374 BLAKE2B 1a278b402bc06959878351946ae8b3c718645a8d02d9940d7d6bd3921d682224e64b15874cc54ea003d15c546681bb4bc3b26fa397f28f97178a93df5876bb25 SHA512 f6a712268917b10640e52925e5bd9d6cf5f4415054830208fae3cd8a23ceaf744259d7a9225a30bc536e9f7aaf452a61baed96b27129bc07de5cf68e282cf19f
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/csv-mode/csv-mode-1.50.ebuild b/app-emacs/csv-mode/csv-mode-1.50.ebuild
new file mode 100644
index 000000000000..a55d48063024
--- /dev/null
+++ b/app-emacs/csv-mode/csv-mode-1.50.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A major mode for editing comma-separated value files"
+HOMEPAGE="http://centaur.maths.qmw.ac.uk/Emacs/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/csv-mode/files/50csv-mode-gentoo.el b/app-emacs/csv-mode/files/50csv-mode-gentoo.el
new file mode 100644
index 000000000000..51a50f3543bb
--- /dev/null
+++ b/app-emacs/csv-mode/files/50csv-mode-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'csv-mode "csv-mode"
+ "Major mode for editing comma-separated value files." t)
+(add-to-list 'auto-mode-alist '("\\.[Cc][Ss][Vv]\\'" . csv-mode))
diff --git a/app-emacs/csv-mode/metadata.xml b/app-emacs/csv-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/csv-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/cycle-buffer-2.16 b/app-emacs/cycle-buffer-2.16
deleted file mode 100644
index c4246282e3c1..000000000000
--- a/app-emacs/cycle-buffer-2.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Select buffer by cycling through
-EAPI=6
-HOMEPAGE=https://www.emacswiki.org/emacs/cycle-buffer.el
-KEYWORDS=~amd64
-LICENSE=public-domain
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/gavv/distfiles/raw/master/cycle-buffer-2.16.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=4be7ed4e297b2ed839d87a67103beca2
diff --git a/app-emacs/cycle-buffer/Manifest b/app-emacs/cycle-buffer/Manifest
new file mode 100644
index 000000000000..48f61c19e01d
--- /dev/null
+++ b/app-emacs/cycle-buffer/Manifest
@@ -0,0 +1,4 @@
+AUX 50cycle-buffer-gentoo.el 76 BLAKE2B 72fac6d037804f88aee631205aa0ee192c48cfe64a8efe5a90496b24b03429503d0010b9ee082181540d374c2ff9066425e35a3ef5fd6af9759264873a129527 SHA512 e19c819b054a961e3265c6bfc96f20bfc90ee9cfbdf78f30d86e211b168e4e4ccf94ed6ef8d52c08a37dee3202773eb1164f7d758572c943e3bb2de52fea3fbd
+DIST cycle-buffer-2.16.el.xz 5392 BLAKE2B 7d4b765da320109274605731bfc6910bf75ab4a0610f75d4dd4a4b45e03c7103a76bf0dedffbdb67831d0c8cb04f147f8c77757cb40b714c80a7bc69c9105b79 SHA512 344c07af9e2c9ff06dfa81ff44d02c1e8a9434381486c227a7af06c989e7c623b0f9bf547500b320e2ede7d181f0212725c03a84f53a43683ab3b8229b99a6c6
+EBUILD cycle-buffer-2.16.ebuild 520 BLAKE2B cb7e1cdcb7de409fadf3bb0e056207e6dd3c4c7373473c17d892ffb8ab264a9cbbcc63bc877114b37d32ffe7fbc1bfab6608772f9030b3b66c45c511e6b65537 SHA512 29003c5ff1d0ee68df8ca4b14aa406302eaf1764854f8694075e8a255fda26e9302bb9642560469ccd36c1427a8935815800513dee03d86dbbe3373b55524719
+MISC metadata.xml 292 BLAKE2B 046265ce3ff94f04bba9b4b344d852203657df8dd300f30620df260bad1c56b3c23a8c48d073f70f571f733af9a7c034922e0465878028ee8f748060a6816ec6 SHA512 f0115ae686d3003f4264968d3aeb0b054830f87f35378e15e205a729d591c8697507d3c76ead9e1f0bab1f1f66a3fda108322dbcec7b857a37000511d1dd17df
diff --git a/app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild b/app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild
new file mode 100644
index 000000000000..9928f250bece
--- /dev/null
+++ b/app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Select buffer by cycling through"
+HOMEPAGE="https://www.emacswiki.org/emacs/cycle-buffer.el"
+# taken from https://www.emacswiki.org/emacs/download/cycle-buffer.el
+SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile *.el
+ elisp-make-autoload-file
+}
diff --git a/app-emacs/cycle-buffer/files/50cycle-buffer-gentoo.el b/app-emacs/cycle-buffer/files/50cycle-buffer-gentoo.el
new file mode 100644
index 000000000000..899d5178c418
--- /dev/null
+++ b/app-emacs/cycle-buffer/files/50cycle-buffer-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "cycle-buffer-autoloads" nil t)
diff --git a/app-emacs/cycle-buffer/metadata.xml b/app-emacs/cycle-buffer/metadata.xml
new file mode 100644
index 000000000000..c6a53b949e75
--- /dev/null
+++ b/app-emacs/cycle-buffer/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/d-mode-2.0.6 b/app-emacs/d-mode-2.0.6
deleted file mode 100644
index 7a13d4481e7b..000000000000
--- a/app-emacs/d-mode-2.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major mode for editing D code
-EAPI=5
-HOMEPAGE=https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode https://www.emacswiki.org/emacs/DMode
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/2.0.6.tar.gz -> d-mode-2.0.6.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=6f6ea9e0f8d0f499f9b6e42023b4f3cc
diff --git a/app-emacs/d-mode/Manifest b/app-emacs/d-mode/Manifest
new file mode 100644
index 000000000000..334b72428a09
--- /dev/null
+++ b/app-emacs/d-mode/Manifest
@@ -0,0 +1,5 @@
+AUX 50d-mode-gentoo.el 157 BLAKE2B d92e7cb8b7121e989f3e68634db63f175b5145bf7f562758bcb7c3fce318ce6c72eef12201c9b332ea1309e4f4a20a6ea3051b8eab997413af08b4fc52fe1339 SHA512 12a89496192f10a221bf3be386339dd2494304f5e0e8c8ebca1d9e622b5304609b01370d64b009120f333794a41815fd73124114035e02ce53241f58e9968546
+AUX d-mode-2.0.6-emacs-24.4.patch 323 BLAKE2B b24721dbd61cd5fe330e81bdb44258ce3e25e54ebc0215ed3edd28e5fdf282100c860e811a70868090288d780df925561c252c1582be7b26ae71ba905662c19f SHA512 254fb7b91ad4e355d70ab83b4b597293935d2375d895a78adc03155a69a2288a0bce2b9dc48244dfdbecc63d95724db50622e99ebb0562ad41cd6e828a4ea314
+DIST d-mode-2.0.6.tar.gz 5465 BLAKE2B 4ccb9341ac25c4856c1dc3ce7a7acc68942fb7ce3dbb6818b2fab6de843b6f6757907e994d2e777d0590b8ae26fbf4483eaa7d1b5e0ab7d635047ced4a276c60 SHA512 8706459af61e49b3ca1ef6d4021abff752706b4dca9385c4fbe2b7c29ecb028dc3df558b1e9b3a358e5c38e3d2ab7121505583f95d3afdd9a06bc9449ed678f2
+EBUILD d-mode-2.0.6.ebuild 543 BLAKE2B 37d9237b49b518888045033fa09548dfddaca372b0420c9d73942bc40b89f830e35da76a0040b53ea90737fbe04d51ef1ccabd6ce034b6dc4e4d315d94a9cd6f SHA512 d01e8cf839d377eb7195af98aaeecf00bca0b65b6bc1f3500bda3342f4c362f8c30745bba52f6c672040ab515cc512c75e1b379ab6c13b453085e83d1c5e485b
+MISC metadata.xml 382 BLAKE2B ca4199b6d9d35540d53a4bc673fa59babecd80579ede4c227954492ef2591d6d09e0d3938629f21606c7547ed3155d733582a1298067ffaeaae20bc0b5218e28 SHA512 8a55a3ae2146d4ebeef5075312482f0962e8e219f73cc9997c7ba19978830d42ac22c02b84be34a377841858d9fc19d85ce9243546759e8666230e9c311347b0
diff --git a/app-emacs/d-mode/d-mode-2.0.6.ebuild b/app-emacs/d-mode/d-mode-2.0.6.ebuild
new file mode 100644
index 000000000000..04e0ae831af9
--- /dev/null
+++ b/app-emacs/d-mode/d-mode-2.0.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing D code"
+HOMEPAGE="https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode
+ https://www.emacswiki.org/emacs/DMode"
+SRC_URI="https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/Emacs-D-Mode-2.0.6"
+ELISP_PATCHES="${P}-emacs-24.4.patch"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/d-mode/files/50d-mode-gentoo.el b/app-emacs/d-mode/files/50d-mode-gentoo.el
new file mode 100644
index 000000000000..6fdf0dd8f397
--- /dev/null
+++ b/app-emacs/d-mode/files/50d-mode-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'd-mode "d-mode" "Major mode for editing D code" t)
+(add-to-list 'auto-mode-alist '("\\.d[i]?\\'" . d-mode))
diff --git a/app-emacs/d-mode/files/d-mode-2.0.6-emacs-24.4.patch b/app-emacs/d-mode/files/d-mode-2.0.6-emacs-24.4.patch
new file mode 100644
index 000000000000..e8fc3500b48e
--- /dev/null
+++ b/app-emacs/d-mode/files/d-mode-2.0.6-emacs-24.4.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/536490
+https://bugs.gentoo.org/547026
+
+--- Emacs-D-Mode-2.0.6-orig/d-mode.el
++++ Emacs-D-Mode-2.0.6/d-mode.el
+@@ -66,6 +66,7 @@
+ ;; necessary to get them compiled.)
+ ;; Coment out 'when-compile part for debugging
+ (eval-when-compile
++ (require 'cl)
+ (require 'cc-langs)
+ (require 'cc-fonts)
+ )
diff --git a/app-emacs/d-mode/metadata.xml b/app-emacs/d-mode/metadata.xml
new file mode 100644
index 000000000000..5ce80faac3c7
--- /dev/null
+++ b/app-emacs/d-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">Emacs-D-Mode-Maintainers/Emacs-D-Mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/dash-2.13.0 b/app-emacs/dash-2.13.0
deleted file mode 100644
index 79e4d2a15247..000000000000
--- a/app-emacs/dash-2.13.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=A modern list library for Emacs
-EAPI=5
-HOMEPAGE=https://github.com/magnars/dash.el
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/magnars/dash.el/archive/2.13.0.tar.gz -> dash-2.13.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=ec6f430e0dbf9ddd86bd15258dc71305
diff --git a/app-emacs/dash-2.14.1 b/app-emacs/dash-2.14.1
deleted file mode 100644
index c72d973ef166..000000000000
--- a/app-emacs/dash-2.14.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=A modern list library for Emacs
-EAPI=6
-HOMEPAGE=https://github.com/magnars/dash.el
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/magnars/dash.el/archive/2.14.1.tar.gz -> dash-2.14.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=6ce1b5a990717c85a8af9f04ca8e8721
diff --git a/app-emacs/dash/Manifest b/app-emacs/dash/Manifest
new file mode 100644
index 000000000000..88632fb3061d
--- /dev/null
+++ b/app-emacs/dash/Manifest
@@ -0,0 +1,6 @@
+AUX 50dash-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST dash-2.13.0.tar.gz 146280 BLAKE2B e9552a19b1f84db0e16fba07fe5bcfc0eb8a6871aabf395fa7ca527b77ba23616fdaa29e67d73e6cf11260bd23807be17de1e52f4abd23b0f9562cb26e6a5feb SHA512 59969e3df1b258a1bae76904e5abaf64c5143de9b8994a04799dad3a317c6ccc1dcd19b99a337a23bce0e46cfb6bc90bf8c6b0e6a532946b4f0ec188d331b559
+DIST dash-2.14.1.tar.gz 141115 BLAKE2B 87fc7a02c66161d1c16debc54c6336f36cc47cf7c7c470d190424b9c463723058ef6f72cadf3f4d4215b36f369b9e5356101c4ea16fede10cefde90b5e0b384b SHA512 cfd4ed7a9eab881a0c3bd2744e78c5ef99a92db4d3afee8c632c0a766adcdbf1999f4e9770e2c4e941526d488dd6f9327937389490cc2310d79b38c5bf2ddd12
+EBUILD dash-2.13.0.ebuild 545 BLAKE2B 083977c9bcd22b3c3e86c7f1e78f54b40ea3483b5873bdda957b9ea290a8ead2807178e1b2948001e32bad26b855f24215d87ea2a5cfcae847d2625a9144b307 SHA512 0179b3c93d4fdf86889bc649599cd27684c037e07efda724069ea5618e41c1f8c52a63d680266b703f743c0c9e322cfaf354634822523dfeff56a55519257d57
+EBUILD dash-2.14.1.ebuild 547 BLAKE2B 5c2a534c0635c33eaec2d55e65292e7cd52509ea4a06156dc80f11fe8216f8a3b8d63bd273bac818cbf19d1f0b467a5c60c7e32bf7e69f5035a8310816c67889 SHA512 82efe262885da628b70bc2656b0dfad8f26d59084f026830a15af9b1b62906474d7f7e7618c77f785253e65cf6fc5eb80ed412a47b8927ae91fd3547fd0e70cb
+MISC metadata.xml 360 BLAKE2B e70caec7e3633788a79217f8d41bd69056ed620396e4d22ecd0d80ad82f7dbe2e9ac3872c55cd94682cd16960e682b1f648863373cc941559b40045612188f8c SHA512 8de7334410a02599aff54733234d7b3333c4a61cd2ffc846f3f69df3b43a53c510b2235100fab79274e0727393ecec24e051b42aa36b878d6b45130b5b2e3ff3
diff --git a/app-emacs/dash/dash-2.13.0.ebuild b/app-emacs/dash/dash-2.13.0.ebuild
new file mode 100644
index 000000000000..6d41d2588b8b
--- /dev/null
+++ b/app-emacs/dash/dash-2.13.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A modern list library for Emacs"
+HOMEPAGE="https://github.com/magnars/dash.el"
+SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+DEPEND="sys-apps/texinfo"
+
+S="${WORKDIR}/${PN}.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="dash.texi"
+DOCS="README.md"
+
+src_test() {
+ ./run-tests.sh || die
+}
diff --git a/app-emacs/dash/dash-2.14.1.ebuild b/app-emacs/dash/dash-2.14.1.ebuild
new file mode 100644
index 000000000000..da2a16d87b0b
--- /dev/null
+++ b/app-emacs/dash/dash-2.14.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="A modern list library for Emacs"
+HOMEPAGE="https://github.com/magnars/dash.el"
+SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="sys-apps/texinfo"
+
+S="${WORKDIR}/${PN}.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="dash.texi"
+DOCS="README.md"
+
+src_test() {
+ ./run-tests.sh || die
+}
diff --git a/app-emacs/dash/files/50dash-gentoo.el b/app-emacs/dash/files/50dash-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/dash/files/50dash-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/dash/metadata.xml b/app-emacs/dash/metadata.xml
new file mode 100644
index 000000000000..dd425a588a53
--- /dev/null
+++ b/app-emacs/dash/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">magnars/dash.el</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/ddskk-16.2 b/app-emacs/ddskk-16.2
deleted file mode 100644
index adf90612648f..000000000000
--- a/app-emacs/ddskk-16.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-24
-DESCRIPTION=One Japanese input methods on Emacs
-EAPI=6
-HOMEPAGE=http://openlab.ring.gr.jp/skk/
-IUSE=ruby
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) >=virtual/emacs-24
-SLOT=0
-SRC_URI=http://openlab.ring.gr.jp/skk/maintrunk/ddskk-16.2.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 ruby-single 7435c1687c234eb8cf5b212756f6381e ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c
-_md5_=54eca1b48341505e20fe20f3250219e0
diff --git a/app-emacs/ddskk/Manifest b/app-emacs/ddskk/Manifest
new file mode 100644
index 000000000000..d6990a793c96
--- /dev/null
+++ b/app-emacs/ddskk/Manifest
@@ -0,0 +1,4 @@
+AUX 50ddskk-gentoo.el 112 BLAKE2B 090925d25ada70386b13c259fa0ac6eae72f45c7bcb9272b65f8332eddc384d52d473a33296ef0af27e6b55e85ad5eb6cb5a64d53eb15de8b4cb770461ff1472 SHA512 7d7212bb6da992a3bad619d4def98acbe31c4b7226de59c223825e49dbd202d378eb04e386d6087ba5608e4bf1ede8847e2d73d068a6fe147322da7b5329fe09
+DIST ddskk-16.2.tar.gz 886618 BLAKE2B 854b9d57993e8f69af4035df49511ec110a1afd83ee290be8934283fc5f2a1a648b80f80811396083fa019d9eb12469998ff26b692296dd770c21da81c3cad3e SHA512 591d66e2d217a289ce8273ed7da10c0ed72029e961efde0537044f7ad3f5f46943cf5c71ec1d97a27743fcea91a9fab81c86e2772047892f53e2852bf58ef45c
+EBUILD ddskk-16.2.ebuild 1495 BLAKE2B bc16dbebf4a48dd75767065018240d5013a916ce71fa158b6a8a8666d82a6aa8b20b6f8c2bc337b13f4856c8ee925ad0bdc08dc5ad7edef7209b9f410907827d SHA512 e1edfb53fdc5497d44a9e519eca699c773dfb1e997ee6369a5deb95e91d27c222ba8c65df0371d22970cdc49fea26d2c4a3980eb94c96ba726890181a7f16e49
+MISC metadata.xml 450 BLAKE2B 5458defeba3a265354c3a885106a590beb379c83bee36af2859e604a2ae19c108962a6400a614443dfb3a6391088c98474cae996e60bd02d320d9f44de990bf9 SHA512 8a7b366ada5366e2713e3850421729b395862f662476225f3a7ae24dcc0067ff51c4a8ce8408c2ce2082722f0649b0ad8c047230a0223c03e2ef8b416c7e65fe
diff --git a/app-emacs/ddskk/ddskk-16.2.ebuild b/app-emacs/ddskk/ddskk-16.2.ebuild
new file mode 100644
index 000000000000..ec56dd3838d2
--- /dev/null
+++ b/app-emacs/ddskk/ddskk-16.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+USE_RUBY="ruby23 ruby24 ruby25"
+NEED_EMACS="24"
+
+inherit elisp ruby-single
+
+DESCRIPTION="One Japanese input methods on Emacs"
+HOMEPAGE="http://openlab.ring.gr.jp/skk/"
+SRC_URI="http://openlab.ring.gr.jp/skk/maintrunk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ruby"
+
+DEPEND=""
+RDEPEND="|| (
+ app-i18n/skk-jisyo
+ virtual/skkserv
+ )
+ ruby? ( ${RUBY_DEPS} )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ echo "(setq PREFIX \"${ED}/usr\")" >>SKK-CFG
+ echo "(setq SKK_LISPDIR \"${ED}/${SITELISP}/${PN}\")" >>SKK-CFG
+
+ echo "(add-to-list 'load-path (expand-file-name \"..\"))" >> nicola/NICOLA-DDSKK-CFG
+
+ default
+
+ rm -f skk-lookup.el
+ mv {bayesian,tut-code}/*.el .
+}
+
+src_compile() {
+ emake elc info
+
+ emake -C nicola
+}
+
+src_install () {
+ local lispdir=${SITELISP}/${PN}
+ emake install-elc
+ elisp-compile "${ED}"/${lispdir}/skk-setup.el
+ rm -f "${ED}"/${lispdir}/leim-list.el
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+
+ dodoc ChangeLog* README.md READMEs/{AUTHORS,CODENAME,Contributors,FAQ,NEWS,PROPOSAL,TODO}*
+ doinfo doc/skk.info
+
+ local exts=( nicola tut-code ) d f
+ elisp-install ${PN} nicola/*.{el,elc}
+ if use ruby; then
+ dobin bayesian/bskk
+ exts+=( bayesian )
+ fi
+ for d in ${exts[@]}; do
+ docinto ${d}
+ for f in ${d}/{ChangeLog,README}*; do
+ [[ -s ${f} ]] && dodoc ${f}
+ done
+ done
+}
diff --git a/app-emacs/ddskk/files/50ddskk-gentoo.el b/app-emacs/ddskk/files/50ddskk-gentoo.el
new file mode 100644
index 000000000000..66b1e15fa86b
--- /dev/null
+++ b/app-emacs/ddskk/files/50ddskk-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'skk-setup)
+
+(setq skk-large-jisyo "/usr/share/skk/SKK-JISYO.L")
diff --git a/app-emacs/ddskk/metadata.xml b/app-emacs/ddskk/metadata.xml
new file mode 100644
index 000000000000..686eb3809d5c
--- /dev/null
+++ b/app-emacs/ddskk/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">skk-dev/ddskk</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-emacs/desktop+-0.2 b/app-emacs/desktop+-0.2
deleted file mode 100644
index da77809b7be6..000000000000
--- a/app-emacs/desktop+-0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/dash app-emacs/f >=virtual/emacs-23
-DESCRIPTION=desktop+ extends standard desktop module
-EAPI=6
-HOMEPAGE=https://github.com/ffevotte/desktop-plus
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=app-emacs/dash app-emacs/f >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ffevotte/desktop-plus/archive/v0.2.tar.gz -> desktop+-0.2.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=a5c7a45fc1dfda3ece1bc0cd4fdd77ba
diff --git a/app-emacs/desktop+/Manifest b/app-emacs/desktop+/Manifest
new file mode 100644
index 000000000000..13624d900105
--- /dev/null
+++ b/app-emacs/desktop+/Manifest
@@ -0,0 +1,4 @@
+AUX 50desktop+-gentoo.el 72 BLAKE2B 76ac2f6e8e087bf06704946b008f2b9366a3e4eefd0d71d3d5b8d37295ff0dc5dc364c826b3ddf37c3d7cd1ecf47318534f9405683dfe13ad542e055df5361b0 SHA512 a97bf9092cd7e397f2b76d3e0459f9639180a84e481aae7c5b64c08713704173760df8aba7fc05d4aaa4cba7f4ae3b5d578c7db93f9cfcd120b688de4ca53cb4
+DIST desktop+-0.2.tar.gz 19596 BLAKE2B 601591977f981ebf66b9b01d397b08e3e0a72c73515760cf8b3333a0d25a9b8747a2f207ffeb13ed1c0292888049b4263ed6ecc875dd70273661a826be28a89b SHA512 3fe0647e506832e37378862d59f5d748f8db20d4ad776d7486ba3393f67047a69f0e5704042eec2e2327ead89b6b2e55196f5773efbe975f5913a6ec6f01269c
+EBUILD desktop+-0.2.ebuild 591 BLAKE2B 89b4f16e30aca0d226d2ad7fcc0df87ad2bffcaa7d4b27ac9d99ec7a86f3d7f7cbcf9aec25b83389d309a24e3c487e4a21fc7b508b5621f433de1bf09bb0221a SHA512 4047e82313c254fe9ffc2f06c804cc5f0d6ea3bf60461b80e5cbeefdb2a88c3aaff22e96efda374b20f0e63634391b96199792258dddc550d6a47a3051d44962
+MISC metadata.xml 382 BLAKE2B e58ddca456331873929c0d7c527913d08879053ab26681b86071c3d0f7c9e8aa54765bbc482a2ef0b4ed8641626d375180ecfe98b309b1f6ad7ab6841040749a SHA512 0fcba01ddc8ebf9c735b2c095fe3563beb920e1e28022a20f224337c9e122b1e847fa10da179a7412e79b9208a643b7ca2d947434087942f58cd2317f66aebf5
diff --git a/app-emacs/desktop+/desktop+-0.2.ebuild b/app-emacs/desktop+/desktop+-0.2.ebuild
new file mode 100644
index 000000000000..adf858b1a86d
--- /dev/null
+++ b/app-emacs/desktop+/desktop+-0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="desktop+ extends standard desktop module"
+HOMEPAGE="https://github.com/ffevotte/desktop-plus"
+SRC_URI="https://github.com/ffevotte/desktop-plus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+RDEPEND="app-emacs/dash app-emacs/f"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/desktop-plus-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
+
+src_compile() {
+ elisp-compile *.el
+ elisp-make-autoload-file
+}
diff --git a/app-emacs/desktop+/files/50desktop+-gentoo.el b/app-emacs/desktop+/files/50desktop+-gentoo.el
new file mode 100644
index 000000000000..ca3b3828a3ed
--- /dev/null
+++ b/app-emacs/desktop+/files/50desktop+-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "desktop+-autoloads" nil t)
diff --git a/app-emacs/desktop+/metadata.xml b/app-emacs/desktop+/metadata.xml
new file mode 100644
index 000000000000..1c356274625e
--- /dev/null
+++ b/app-emacs/desktop+/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <stabilize-allarches/>
+ <upstream>
+ <remote-id type="github">ffevotte/desktop-plus</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-emacs/develock-0.45 b/app-emacs/develock-0.45
deleted file mode 100644
index 49cdf47ab764..000000000000
--- a/app-emacs/develock-0.45
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Emacs minor mode for highlighting broken formatting rules
-EAPI=5
-HOMEPAGE=https://www.jpl.org/ftp/pub/elisp/ https://www.emacswiki.org/emacs/DevelockMode
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/develock-0.45.el.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=fa3d1f5bdb01fed056e6718980ce8ff2
diff --git a/app-emacs/develock/Manifest b/app-emacs/develock/Manifest
new file mode 100644
index 000000000000..f7de5d4facdc
--- /dev/null
+++ b/app-emacs/develock/Manifest
@@ -0,0 +1,4 @@
+AUX 50develock-gentoo.el 141 BLAKE2B 01c017ba62c65d76dec01e4af0462bfb4030ff70f1cb085077263a19d96ac464684c3fa667822bb2d908f233857c49bc7eb66cd4bd470114ac1fa6841880b98c SHA512 8d6c1e118e4489ac2dfabe344f77491707bf3b9fbbe5a96dcd0f91a363d67200cd764c560c2722e857fc116cb89b404da75015e2086870690305419fd07dc2f3
+DIST develock-0.45.el.gz 13627 BLAKE2B 8c67a46ae7eba961fd64b202128ca19da54251d1079bb4c9091c2b99a6dd6d3f42f1273c5d7ffd371911af3fb3b64e723f6a6d0bd432a1c243701d8ad793bf64 SHA512 e868efe9426ad6aed4c46bbbac3bc90c9207cd94367dedf7ac93710ae04d9f18348b10603c56d436dc1553be94f65b79615d5293578b9e7bb1a7b783d7a3f41e
+EBUILD develock-0.45.ebuild 503 BLAKE2B 2a858dbe5c9acb75ba808142b690cf530e42e9b95d1d1fc2e3aa53373b8c099757c5c99595701ffa25ff03c60babe06d9b4533e78feca004c6f6be55147d6ae8 SHA512 e01d26533631eab1c78f5f67118ed197c6d85430806cefcb61d87b8c69b4a885624255b141a42de694cd85d25742df8740c199d6f46e6a0bb2c6bfafe376f454
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/develock/develock-0.45.ebuild b/app-emacs/develock/develock-0.45.ebuild
new file mode 100644
index 000000000000..ba0d360dd591
--- /dev/null
+++ b/app-emacs/develock/develock-0.45.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Emacs minor mode for highlighting broken formatting rules"
+HOMEPAGE="https://www.jpl.org/ftp/pub/elisp/
+ https://www.emacswiki.org/emacs/DevelockMode"
+# taken from http://www.jpl.org/ftp/pub/elisp/${PN}.el.gz
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/develock/files/50develock-gentoo.el b/app-emacs/develock/files/50develock-gentoo.el
new file mode 100644
index 000000000000..bccdfa2e81c8
--- /dev/null
+++ b/app-emacs/develock/files/50develock-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'develock-mode "develock" "Toggle Develock mode." t)
+(autoload 'turn-on-develock "develock")
diff --git a/app-emacs/develock/metadata.xml b/app-emacs/develock/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/develock/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/df-mode-20050509 b/app-emacs/df-mode-20050509
deleted file mode 100644
index c145a52c271d..000000000000
--- a/app-emacs/df-mode-20050509
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Minor mode to show space left on devices in the mode line
-EAPI=4
-HOMEPAGE=https://web.archive.org/web/20061001221337/http://www.coli.uni-saarland.de/~fouvry/software.html https://www.emacswiki.org/emacs/DfMode
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/df-mode-20050509.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=9bbc4fbdede67fdfe43d2becb8296e58
diff --git a/app-emacs/df-mode/Manifest b/app-emacs/df-mode/Manifest
new file mode 100644
index 000000000000..da6f5394d082
--- /dev/null
+++ b/app-emacs/df-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50df-mode-gentoo.el 74 BLAKE2B e822e639fc1c01f43c4e63b6c9856bcf2353b3251be008348b95be481370f167030fe1a05856bdbca7d146cb9f2656bbf32d3722958a2cd650870ef7d0a7588d SHA512 35de1cfcc792b7da1271bf2ff47b93c706b89aa32cfd77245ea4df15897b5797dfd529ba7c0e89b89acb7e89ac4d4651ba8de0f76badde8b64d45d622c1f4edc
+DIST df-mode-20050509.el.bz2 3867 BLAKE2B f5051cba3b14174017e20983d26cb847ee8daceaf011b0f37f246e4730dd12fef5ed67131a86909636af28f22780563e4c5ba8d282e0272bbf08d0a89cc308e5 SHA512 e4d248d7b1fa9c231bac7d8d478c65d796123234503372ca945f5b122e62d816676c9744d42f41b1c6de6716682ad4233eeb57801155760cf7e4d41dc0e7d535
+EBUILD df-mode-20050509.ebuild 545 BLAKE2B a7131dabc13d3687fa96eb5943e50141968f1bf6836cfa2ebdef163cae9449ef69dee8e9eb671fd3464491002da99e20eb267f5f379346e5dc606d1b388e2d1d SHA512 b6c10bc8055277a67b3d2f713c2ad554bbba85383eeb72b2b7a81b291bbc88beeb293f2fd738d353b8156152ccdeee2dab1d833cd47aea39599bdf09d0032242
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/df-mode/df-mode-20050509.ebuild b/app-emacs/df-mode/df-mode-20050509.ebuild
new file mode 100644
index 000000000000..c46eb76c2460
--- /dev/null
+++ b/app-emacs/df-mode/df-mode-20050509.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Minor mode to show space left on devices in the mode line"
+HOMEPAGE="https://web.archive.org/web/20061001221337/http://www.coli.uni-saarland.de/~fouvry/software.html
+ https://www.emacswiki.org/emacs/DfMode"
+# taken from http://www.coli.uni-saarland.de/~fouvry/files/df-mode.el.gz
+SRC_URI="mirror://gentoo/${P}.el.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/df-mode/files/50df-mode-gentoo.el b/app-emacs/df-mode/files/50df-mode-gentoo.el
new file mode 100644
index 000000000000..78850b6e9c4e
--- /dev/null
+++ b/app-emacs/df-mode/files/50df-mode-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'df-mode "df-mode" nil t)
diff --git a/app-emacs/df-mode/metadata.xml b/app-emacs/df-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/df-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/dictionary-1.10 b/app-emacs/dictionary-1.10
deleted file mode 100644
index 6adfb69e7ca0..000000000000
--- a/app-emacs/dictionary-1.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs package for talking to a dictionary server
-EAPI=5
-HOMEPAGE=http://www.myrkr.in-berlin.de/dictionary/index.html
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.myrkr.in-berlin.de/dictionary/dictionary-1.10.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=654aab74f3e37cd0b430041f780f3458
diff --git a/app-emacs/dictionary/Manifest b/app-emacs/dictionary/Manifest
new file mode 100644
index 000000000000..0502cc2fb596
--- /dev/null
+++ b/app-emacs/dictionary/Manifest
@@ -0,0 +1,4 @@
+AUX 50dictionary-gentoo.el 69 BLAKE2B 7ab2446166a477b09885653ac98616dd4b704bfeccb3509cafb435a56abf1092e534f57728ee7fb84d048823fae1cf23d04479240e42ae43416f0906eac89232 SHA512 787fcef6d82e4805110de6480be97b889d3b7329e4aa852dc36bf2fa8180ad6948935270077dcf257b5f3f7c028b05edc7905714bff0a565c3d54092f49f766e
+DIST dictionary-1.10.tar.gz 33332 BLAKE2B be0e5d851d3d66f7bb0bf08a7763d3c1e54ed8023ee9d0e3560965baad8cddb67894d85f6ace8caac6d2c1aedf24b3b753d7e48e706a49ace1a1a8ba0edf1b42 SHA512 7f5ec0e023ea2ab3f42fbf9200c1ac86cbcb330c14d2fce791f65cdce010d7e6a6c72e0589769dd94fe3c3d7543b730aacfb373e496933caccf8542224bfa356
+EBUILD dictionary-1.10.ebuild 454 BLAKE2B 134315e3b8a34cb85b196a19b466350643a19fe8c193ea1decd696deeac34561df392ad6331d25e23821d56608cdb0004f635ebf54c3590b0139f1c3eeba5042 SHA512 94bedb30aa2c8e3f2445c3f09653f32806f4b8a16482a071f0a47d8afed089cfe7af938fd64d34ccf91e5e85cc81a44e65fb1c910a1f54f79ff5b69a7ff02140
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/dictionary/dictionary-1.10.ebuild b/app-emacs/dictionary/dictionary-1.10.ebuild
new file mode 100644
index 000000000000..c979234a150c
--- /dev/null
+++ b/app-emacs/dictionary/dictionary-1.10.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Emacs package for talking to a dictionary server"
+HOMEPAGE="http://www.myrkr.in-berlin.de/dictionary/index.html"
+SRC_URI="http://www.myrkr.in-berlin.de/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+ELISP_REMOVE="install-package.el lpath.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README"
diff --git a/app-emacs/dictionary/files/50dictionary-gentoo.el b/app-emacs/dictionary/files/50dictionary-gentoo.el
new file mode 100644
index 000000000000..c674336a2bfe
--- /dev/null
+++ b/app-emacs/dictionary/files/50dictionary-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "dictionary-init" nil t)
diff --git a/app-emacs/dictionary/metadata.xml b/app-emacs/dictionary/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/dictionary/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/dircolors-1.0-r2 b/app-emacs/dircolors-1.0-r2
deleted file mode 100644
index d88a86265c0c..000000000000
--- a/app-emacs/dircolors-1.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Provide the same facility of ls --color inside Emacs
-EAPI=5
-HOMEPAGE=http://lfs.irisa.fr/~pad/rawaccess.query/hacks/dircolors.el
-KEYWORDS=amd64 ~ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/dircolors-1.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=2de18fcb85da42b9fb3efca31f87f378
diff --git a/app-emacs/dircolors/Manifest b/app-emacs/dircolors/Manifest
new file mode 100644
index 000000000000..7d5c78c86714
--- /dev/null
+++ b/app-emacs/dircolors/Manifest
@@ -0,0 +1,4 @@
+AUX 50dircolors-gentoo.el 172 BLAKE2B 4bbe09eebcc645dd81568fd6b9b26b3b8abeac9d783a5bfc12e972516c969a0797902fdf4bea3b8eec4eb89af6139553d1d6acde3eeae9b7aa191c30f2201d89 SHA512 4daa55a685b35a7985071901b89ac4e10f172375063f8057679eb690144168f65c21d6016905202aa94d6daa1e6986dba684aa4f9964c06fdd3436cddbfbd6bb
+DIST dircolors-1.0.tar.gz 2597 BLAKE2B e215e172d09699592b23dfa686945309ced317cdcdd27ac7632147adf51899f64662113aadaf87b8bd8bb2415afea9158c87d4c99ce3a586267c715d62d8e825 SHA512 345faf78607ce7522b21b14b34643b8c9864648bc99327ce7699daed91bf0050f69e3f3d229df4271ba47d8262b8555c394e6d4b3038ffb7fa53d5aea7cb69f7
+EBUILD dircolors-1.0-r2.ebuild 396 BLAKE2B 857019034d725af8cfc6c28a92406ee0e3d3ec4a8827c07b13901f742aa9ddc94e075d73318e97ba5d316299402b6706beb7f38bf7067bff8ba8a5206ebd1ea7 SHA512 9f32c7986ae5463659273feb5a4e6539b19cd9be4789a8b7c6e41846918661fc84484b69f68e2e4d8e47627df49881d880c407f251cad8db6086dd66c299c8dc
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/dircolors/dircolors-1.0-r2.ebuild b/app-emacs/dircolors/dircolors-1.0-r2.ebuild
new file mode 100644
index 000000000000..6593fd6bacd1
--- /dev/null
+++ b/app-emacs/dircolors/dircolors-1.0-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Provide the same facility of ls --color inside Emacs"
+HOMEPAGE="http://lfs.irisa.fr/~pad/rawaccess.query/hacks/dircolors.el"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/dircolors/files/50dircolors-gentoo.el b/app-emacs/dircolors/files/50dircolors-gentoo.el
new file mode 100644
index 000000000000..618b17ca7317
--- /dev/null
+++ b/app-emacs/dircolors/files/50dircolors-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'dircolors "dircolors" nil t)
+(add-hook 'completion-list-mode-hook 'dircolors)
+(add-hook 'buffer-menu-mode-hook 'dircolors)
diff --git a/app-emacs/dircolors/metadata.xml b/app-emacs/dircolors/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/dircolors/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/dired-sort-menu-1.26 b/app-emacs/dired-sort-menu-1.26
deleted file mode 100644
index d275402d63f8..000000000000
--- a/app-emacs/dired-sort-menu-1.26
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Sort entries in Dired mode
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/DiredSortMenu
-KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/dired-sort-menu-1.26.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=d253ae322ac667913331ea69c50b19aa
diff --git a/app-emacs/dired-sort-menu/Manifest b/app-emacs/dired-sort-menu/Manifest
new file mode 100644
index 000000000000..bc482bb80b65
--- /dev/null
+++ b/app-emacs/dired-sort-menu/Manifest
@@ -0,0 +1,4 @@
+AUX 50dired-sort-menu-gentoo.el 108 BLAKE2B 3c5c9399b4e005090445f758f6735ec2e0336ea823ad3148436455593b7b5db704d4d967267ccc4c019ef87e669e927e4c3ed81055a4f9c382a54842667cf834 SHA512 58400af888ca10b5865b993d1086174d8a79a19c4db6190ee3977b49579411108841dfdf86ae6ed781742bed5b931645a49f1a5ed8a5385f27b809c8a3ea1a43
+DIST dired-sort-menu-1.26.tar.gz 9770 BLAKE2B c594e8577ab78ca376056ff1f6afc23f61a5a6ce8b0ed914d71a91bdb9bfbb77e4cedf1e8db81bb9afc56e346305f587bdc83e8c6c3427377a3370bdf92f27a6 SHA512 aab746704636c01b7319574274786ce4bdb36e94b738a8cf2fdfd22aaddf8a68d9ac274a0f6c34caaed505f8ccfe8ad932a64f560d2e312ac161af528d63a577
+EBUILD dired-sort-menu-1.26.ebuild 356 BLAKE2B 511613eaeda9c2066f3d55aa457cf035083b45458f03cdd965c093ddd01ff8da5463a65646ef9251dddb2b64cf92c551864f60aa238d44856b8332c44d8970f7 SHA512 1b901acf1b1a817dccb45538b788080460ff81ba3ac429eb02d1625839c44956efd900749974213bd9a7293f986cbe5afd6c89bcbbc78a7a67200f508ed8866e
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/dired-sort-menu/dired-sort-menu-1.26.ebuild b/app-emacs/dired-sort-menu/dired-sort-menu-1.26.ebuild
new file mode 100644
index 000000000000..4f71b4366131
--- /dev/null
+++ b/app-emacs/dired-sort-menu/dired-sort-menu-1.26.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Sort entries in Dired mode"
+HOMEPAGE="https://www.emacswiki.org/emacs/DiredSortMenu"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/dired-sort-menu/files/50dired-sort-menu-gentoo.el b/app-emacs/dired-sort-menu/files/50dired-sort-menu-gentoo.el
new file mode 100644
index 000000000000..07e02ebcbd1b
--- /dev/null
+++ b/app-emacs/dired-sort-menu/files/50dired-sort-menu-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-hook 'dired-load-hook
+ (lambda () (require 'dired-sort-menu)))
diff --git a/app-emacs/dired-sort-menu/metadata.xml b/app-emacs/dired-sort-menu/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/dired-sort-menu/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/distel-4.0.6 b/app-emacs/distel-4.0.6
deleted file mode 100644
index 2a93d445fe32..000000000000
--- a/app-emacs/distel-4.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=dev-lang/erlang-11.2.5[emacs] >=virtual/emacs-23
-DESCRIPTION=Distributed Emacs Lisp for Erlang
-EAPI=5
-HOMEPAGE=https://code.google.com/p/distel/ https://www.emacswiki.org/emacs/DistributedEmacsLisp
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/erlang-11.2.5[emacs] >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/massemanet/distel/archive/4.0.6.tar.gz -> distel-4.0.6.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=6913ad83c31042a7cf02fd581afd91c9
diff --git a/app-emacs/distel/Manifest b/app-emacs/distel/Manifest
new file mode 100644
index 000000000000..6a5501baa73d
--- /dev/null
+++ b/app-emacs/distel/Manifest
@@ -0,0 +1,4 @@
+AUX 50distel-gentoo.el 197 BLAKE2B 4c58633362840f228ff45786c2ded8811504def269f978d79f853bf556c2c673b8235203ed72b2119cf27f252fb603643562e26cb3ca7c75a4550461b9b95267 SHA512 1ed45f84dde596713c8f14b0eed011d9e2f073196f55cf355f3ad8c4b540aac94d7d4a1780a0020719b74f4eb3a610094ab5ed4e1ad142604937fbdaf50d2b6b
+DIST distel-4.0.6.tar.gz 210257 BLAKE2B 615682bfc2b773a78ad85d4817135144dda787d1db57b2743ea2fca8ed672fc1e37f6bc23803c9cc2b6096e7376d318cd7c25c3133f7b9c1326dbd451273841b SHA512 510f82b6794379d89020d234462e09251e0db285ebc111eaf096e32a4e3619384650cb2b47ed68d38762a496504b58981c73ca5b930bd0eb1407aee9599c149f
+EBUILD distel-4.0.6.ebuild 922 BLAKE2B 3c604aae95aa29fd62f69d57750217fae6dd8a41636bf0d8affca05c79abc9fa0e670be9f30336c2291a0db4259995b19652efd456c083fab08e95f560fa5b45 SHA512 013f6fcbaa8baae4e291fa1649d238351e166ad727a4545f06be15fea7603b670356cdacc72df4e3448f132fa99035a6981f1518833077317f59825cadc42fef
+MISC metadata.xml 390 BLAKE2B 995ade09d45f16251665ffd7198d296959276bcc01ae085ecaba280022e47dbb3b9f6ebbbfcdd6d5038ef7dfe7779894a25fbc32feb5953c297e20f4321f6d7b SHA512 3652b1dc7101e291fbe1a9f4a1a54fb5692ce0e345fbd1164b6c32ae57e32af90dea1b22a648e7083d7b18f4730c6338da34e9cf3688a2e9ccee134f2dcda26c
diff --git a/app-emacs/distel/distel-4.0.6.ebuild b/app-emacs/distel/distel-4.0.6.ebuild
new file mode 100644
index 000000000000..b0cdc9f49d4a
--- /dev/null
+++ b/app-emacs/distel/distel-4.0.6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Distributed Emacs Lisp for Erlang"
+HOMEPAGE="https://code.google.com/p/distel/
+ https://www.emacswiki.org/emacs/DistributedEmacsLisp"
+SRC_URI="https://github.com/massemanet/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+# "New BSD License" according to https://code.google.com/p/distel/
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=dev-lang/erlang-11.2.5[emacs]"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ emake base info
+ cd elisp || die
+ elisp-compile *.el
+}
+
+src_install() {
+ emake prefix="${ED}"/usr \
+ ELISP_DIR="${ED}${SITELISP}/${PN}" install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ doinfo doc/distel.info
+ dohtml doc/distel/*.html
+ dodoc AUTHORS ChangeLog NEWS README*
+ use doc && dodoc doc/gorrie02distel.pdf
+}
diff --git a/app-emacs/distel/files/50distel-gentoo.el b/app-emacs/distel/files/50distel-gentoo.el
new file mode 100644
index 000000000000..485b2dc27746
--- /dev/null
+++ b/app-emacs/distel/files/50distel-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'distel-erlang-mode-hook "distel" nil t)
+(add-hook 'erlang-mode-hook 'distel-erlang-mode-hook)
+(setq distel-ebin-directory "/usr/share/distel/ebin")
diff --git a/app-emacs/distel/metadata.xml b/app-emacs/distel/metadata.xml
new file mode 100644
index 000000000000..ee26b8d81751
--- /dev/null
+++ b/app-emacs/distel/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="google-code">distel</remote-id>
+ <remote-id type="github">massemanet/distel</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/doctest-mode-0.4 b/app-emacs/doctest-mode-0.4
deleted file mode 100644
index a46db4d2b1d2..000000000000
--- a/app-emacs/doctest-mode-0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=!<app-emacs/python-mode-5.1.0 >=virtual/emacs-23
-DESCRIPTION=An Emacs major mode for editing Python source
-EAPI=5
-HOMEPAGE=http://ed.loper.org/projects/doctestmode/
-KEYWORDS=amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86 ~x86-fbsd
-LICENSE=HPND
-RDEPEND=!<app-emacs/python-mode-5.1.0 >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://python-mode.svn.sourceforge.net/viewvc/*checkout*/python-mode/trunk/python-mode/doctest-mode.el?revision=460 -> doctest-mode.el
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=ff9e441c0e2d9b64c687b19e39554b79
diff --git a/app-emacs/doctest-mode/Manifest b/app-emacs/doctest-mode/Manifest
new file mode 100644
index 000000000000..01e8fceb523d
--- /dev/null
+++ b/app-emacs/doctest-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 60doctest-mode-gentoo.el 191 BLAKE2B 92514ec6c9b9c193f9693d3a2bebb2574a58ca723679688542726d2d8d502c3a7bffbb7b89b7b5e2538c9a3f57ea7dd138586895d6e0b9d8ea7c73d4c32338ec SHA512 b8cd1cc6a2f8fed8b7c979736422050182a008d78665d4dd0897bcd34dde7a214b9e62533a1df6a1021f7028a22e78cd8f31a2515835c60ab492cff6e294a8fe
+DIST doctest-mode.el 75232 BLAKE2B aefe0953e66ebf5a3dd8a650a013af66d9eda41a496411012caf49098daa67d5576b5e1fb149cdfe4d088bc3342b83943676b58d088e685ee724875ab9aa0c15 SHA512 e32326644cb66bf5cfa9a597364a46b2279636368c751940eb418c670219cd907ecb60f6d2b6a8a4ec8970df4f17500be053b9fc6b75fece908dc37329d9aa9c
+EBUILD doctest-mode-0.4.ebuild 634 BLAKE2B 9178085c1b5a8ecf1443bd75fbf726a036e7db2b5aadb11b3f7b40bbfd5cd16575df09cdd76f8664702464a8f5e32fecbc243b1b255f01a41922c5059424530b SHA512 d07d13675697d1df22765a9c2e9ca2ad1d50983d2ccf3f5e69375e893a0efe9157464be56fb8668dc138ec2502cfa9f0f77f63c18c294cc94a3d55cc17939dea
+MISC metadata.xml 365 BLAKE2B 0022a468707eac2f753ef622f03d99d41455cddb87c78bd0a33c33f9ad7f9b69900e7b5684859ee8630fd4f973f5dae806aee1fd6837102a826196c5c0e38fa2 SHA512 2965f445a0f0def6b42819c9f9cdbf1e739e20b4998d954e1065c09826e7eef2383735764fe50c99b811aad0736cf4a185095926e24712a94c272c278c3be4d7
diff --git a/app-emacs/doctest-mode/doctest-mode-0.4.ebuild b/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
new file mode 100644
index 000000000000..c0b80debbc71
--- /dev/null
+++ b/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Emacs major mode for editing Python source"
+HOMEPAGE="http://ed.loper.org/projects/doctestmode/"
+SRC_URI="http://python-mode.svn.sourceforge.net/viewvc/*checkout*/python-mode/trunk/python-mode/doctest-mode.el?revision=460 -> ${PN}.el"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86 ~x86-fbsd"
+
+DEPEND="!<app-emacs/python-mode-5.1.0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+SITEFILE="60${PN}-gentoo.el"
+
+src_unpack() {
+ cp "${DISTDIR}"/${PN}.el "${WORKDIR}"
+}
diff --git a/app-emacs/doctest-mode/files/60doctest-mode-gentoo.el b/app-emacs/doctest-mode/files/60doctest-mode-gentoo.el
new file mode 100644
index 000000000000..987888a487e5
--- /dev/null
+++ b/app-emacs/doctest-mode/files/60doctest-mode-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'doctest-mode "doctest-mode"
+ "Editing mode for Python Doctest examples." t)
+(add-to-list 'auto-mode-alist '("\\.doctest\\'" . doctest-mode))
diff --git a/app-emacs/doctest-mode/metadata.xml b/app-emacs/doctest-mode/metadata.xml
new file mode 100644
index 000000000000..9f2796728761
--- /dev/null
+++ b/app-emacs/doctest-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">python-mode.svn</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/doxymacs-1.8.0-r3 b/app-emacs/doxymacs-1.8.0-r3
deleted file mode 100644
index 1a14c1b7e583..000000000000
--- a/app-emacs/doxymacs-1.8.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=dev-libs/libxml2-2.6.13 >=virtual/emacs-23
-DESCRIPTION=Doxygen editing minor mode
-EAPI=5
-HOMEPAGE=http://doxymacs.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/libxml2-2.6.13 >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://sourceforge/doxymacs/doxymacs-1.8.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5a343760d9dc6d77e002778fda24e094
diff --git a/app-emacs/doxymacs/Manifest b/app-emacs/doxymacs/Manifest
new file mode 100644
index 000000000000..74af7703e15f
--- /dev/null
+++ b/app-emacs/doxymacs/Manifest
@@ -0,0 +1,5 @@
+AUX 50doxymacs-gentoo.el 502 BLAKE2B 0cad3693c6eae3d87c378b743bcf577398ba3f9a1d031d16328e8b2948588b107e74d9b755696fce36bfa4b7ad28704bf5185879d24b2d1c04cf9e783350baff SHA512 1ce4aee60f650daca6d1597356ccc8d2e411c8d71f4236dd396709c6d2e03699d78626dba1e0f0b7c67701267436d62d56b70c9fbc1a5770e0018e7014badc75
+AUX doxymacs-1.8.0-gcc7.patch 2868 BLAKE2B 824046926df6d35e05873ddc39689bb1f4b50b0eaeec3a78ac48a54248323d297e062820376ab62d8b0a1708c311b5d31e50c8288c5a29cccf69ca711ba4c8a1 SHA512 2ac07420a59ecd2a90de1dcfe0b0750d527a6e12100bbbf453adbad9e046ab036708c4463e9d50507e099cf2246d867e748903d8b6a8e213b0755288625c1e03
+DIST doxymacs-1.8.0.tar.gz 133600 BLAKE2B 0e1545498234eec6259ab89a406286dc6f73c1fbec5001ef3e89513de6d91b499e33ca6e25b344dd33c763c59424e592647619f548b223ab1f9ac821815e60d4 SHA512 7461a8a415aadf331f856e4f122712cbedc2907eff9e452f24e6ee83b96903d9944d2cfdbcfeab8a66144a0be508eae723c29f82a081df9723560b10c444f8ac
+EBUILD doxymacs-1.8.0-r3.ebuild 711 BLAKE2B a7fdc5e8697de7c8f427019be1d89bf93f5752af4366946017194c525c4711c2e7a7c4d523713710d974f68366e63f3ed045b83d847e66a28b9f2b409a422357 SHA512 a90c2f6704d36637630a9a43b1fe8619e08a531716c22361b6066d2476f8c572443521b6afcaad338a2bfce1b5517bd617c28b299b43817507f9c9b85e1b9ef0
+MISC metadata.xml 335 BLAKE2B cf3ad8111a61d84548eff97c2570107d55163f29864d48e3a32607305cc245a2742c1e5580c37c3d95bc5f576e0d556e94763ca0678dec1af6a76e59261d4bac SHA512 25405ab050cf5173b07c80dd4e0eec376be3e6e666934d2f64ad978dfe8b9ad54a33c6b83adb01b96cff912a97cd64ae1009dad45c83ef0ec7c3dfde2f3fe9da
diff --git a/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild b/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild
new file mode 100644
index 000000000000..5d9ed4e59e7f
--- /dev/null
+++ b/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp flag-o-matic
+
+DESCRIPTION="Doxygen editing minor mode"
+HOMEPAGE="http://doxymacs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND=">=dev-libs/libxml2-2.6.13"
+RDEPEND="${DEPEND}"
+
+ELISP_PATCHES="${P}-gcc7.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+ append-flags -Wno-error #260874
+ econf --with-lispdir="${SITELISP}/${PN}"
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/app-emacs/doxymacs/files/50doxymacs-gentoo.el b/app-emacs/doxymacs/files/50doxymacs-gentoo.el
new file mode 100644
index 000000000000..47efe70e8afb
--- /dev/null
+++ b/app-emacs/doxymacs/files/50doxymacs-gentoo.el
@@ -0,0 +1,12 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'doxymacs-mode "doxymacs"
+ "Minor mode for using/creating Doxygen documentation." t)
+(autoload 'doxymacs-font-lock "doxymacs"
+ "Turn on font-lock for Doxygen keywords." t)
+(add-hook 'c-mode-common-hook 'doxymacs-mode)
+
+;; optional font-lock support
+;;(defun gentoo-doxymacs-font-lock-hook ()
+;; (if (or (eq major-mode 'c-mode) (eq major-mode 'c++-mode))
+;; (doxymacs-font-lock)))
+;;(add-hook 'font-lock-mode-hook 'gentoo-doxymacs-font-lock-hook)
diff --git a/app-emacs/doxymacs/files/doxymacs-1.8.0-gcc7.patch b/app-emacs/doxymacs/files/doxymacs-1.8.0-gcc7.patch
new file mode 100644
index 000000000000..b30a955baa87
--- /dev/null
+++ b/app-emacs/doxymacs/files/doxymacs-1.8.0-gcc7.patch
@@ -0,0 +1,104 @@
+Fix compilation with GCC 7.
+https://bugs.gentoo.org/635746
+
+--- doxymacs-1.8.0.orig/c/doxymacs_parser.c
++++ doxymacs-1.8.0/c/doxymacs_parser.c
+@@ -70,6 +70,7 @@
+
+ hash_entry *symbol_hash[HASH_SIZE];
+
++static inline unsigned int hash(const char *s);
+ inline unsigned int hash(const char *s)
+ {
+ unsigned int h = 0;
+@@ -82,6 +83,7 @@
+ return abs(h % HASH_SIZE);
+ }
+
++static inline void AddToHash(completion_list *cl);
+ inline void AddToHash(completion_list *cl)
+ {
+ unsigned int h = hash(cl->symbol);
+@@ -96,6 +98,7 @@
+ }
+
+ /* mmmmm... free hash */
++static inline void FreeHash(void);
+ inline void FreeHash(void)
+ {
+ unsigned int i;
+@@ -117,6 +120,7 @@
+
+ /* XML Helper Functions */
+
++static inline char *XMLTagChild(xmlNodePtr node, const char *name);
+ inline char *XMLTagChild(xmlNodePtr node, const char *name)
+ {
+ xmlNodePtr cur = node->xmlChildrenNode;
+@@ -141,6 +145,7 @@
+ return NULL;
+ }
+
++static inline char *XMLTagAttr(xmlNodePtr node, const char *attr);
+ inline char *XMLTagAttr(xmlNodePtr node, const char *attr)
+ {
+ xmlAttrPtr props = node->properties;
+@@ -167,6 +172,7 @@
+
+ /* Look up functions for symbols and descriptions */
+
++static inline completion_list *LookUpSymbol(const char *symbol);
+ inline completion_list *LookUpSymbol(const char *symbol)
+ {
+ unsigned int h = hash(symbol);
+@@ -187,6 +193,7 @@
+ return NULL;
+ }
+
++static inline desc_url_list *LookUpDesc(completion_list *entry, const char *desc);
+ inline desc_url_list *LookUpDesc(completion_list *entry, const char *desc)
+ {
+ desc_url_list *cur = entry->descs;
+@@ -206,6 +213,8 @@
+
+ /* Add the given name, description and url to our completion list */
+
++static inline int AddToCompletionList(const char *name,
++ const char *desc, const char *url);
+ inline int AddToCompletionList(const char *name,
+ const char *desc, const char *url)
+ {
+@@ -274,6 +283,7 @@
+ }
+
+ /* Encode the given string so that {X}Emacs will understand it */
++static inline char *Encode(const char *s);
+ inline char *Encode(const char *s)
+ {
+ unsigned int extra_len = 0;
+@@ -341,6 +351,7 @@
+
+ /* Output the completion list in a way {X}Emacs can easily read in */
+
++static inline int OutputCompletionList(void);
+ inline int OutputCompletionList(void)
+ {
+ completion_list *cur = comp_list;
+@@ -400,6 +411,7 @@
+
+ /* Clean up */
+
++static inline void FreeCompletionList(void);
+ inline void FreeCompletionList(void)
+ {
+ completion_list *cur = comp_list;
+@@ -428,7 +440,8 @@
+ }
+
+ /* Add the members of a compound to the completion list */
+-
++static inline int AddCompoundMembers(xmlNodePtr compound,
++ const char *name, const char *url);
+ inline int AddCompoundMembers(xmlNodePtr compound,
+ const char *name, const char *url)
+ {
diff --git a/app-emacs/doxymacs/metadata.xml b/app-emacs/doxymacs/metadata.xml
new file mode 100644
index 000000000000..767053e01dce
--- /dev/null
+++ b/app-emacs/doxymacs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="sourceforge">doxymacs</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/dropdown-list-20120329 b/app-emacs/dropdown-list-20120329
deleted file mode 100644
index bfd004718c6b..000000000000
--- a/app-emacs/dropdown-list-20120329
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Drop-down menu interface
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/dropdown-list.el
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/dropdown-list-20120329.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=0402d6ca62dc7d6393838b65203682bb
diff --git a/app-emacs/dropdown-list/Manifest b/app-emacs/dropdown-list/Manifest
new file mode 100644
index 000000000000..b0161535797d
--- /dev/null
+++ b/app-emacs/dropdown-list/Manifest
@@ -0,0 +1,5 @@
+AUX 50dropdown-list-gentoo.el 80 BLAKE2B 1436cae45270d53081bdad97ccb4c013658e4d0464a99e2dd2a8a5d6a7aabaa9ab30e64cccf515980362db6355e1421629b018868d60f47164cb90462c0329ab SHA512 38187bab921b29bdcb2c9e585660f6fab519ab1ab286aa2e848b670e5087578d361d8edf81ac32391e98133583148cb830cd69f67dc7f1d1049cfdb636abb497
+AUX dropdown-list-20090814-selection-face.patch 382 BLAKE2B 9979e1246d15d07b9c10de7d2edde12d75af355519e419108560067276995c18534fafccaccb8c79f97ad7dae9b8975ccf996fbe0f5c33357b532fc6f9dad827 SHA512 197941c2aaf14862d1f6405836c577c9fb1aac32f7e6cd18b44aabbeaa0e84036f752fcd56c7324d922bfdd14684d355689d60d1b91140f758d080246acd6dcc
+DIST dropdown-list-20120329.el.xz 3104 BLAKE2B 37d240cad53bf2062b3877f4d6118c6f1fedd28da68f7e4d7ffb9d38492a5805f7e01c5d640770e40ab271fc007fd640fd9500d15c208f9c5af79c01c19b9330 SHA512 fac1139c1339cb94be6bfd2c0e6adddfd1851b55aaba6112e0c451e2666f22cc0fa9013d5cc03bb86c6adf3e4f076d90975ab8e59546956d753cd9613309919d
+EBUILD dropdown-list-20120329.ebuild 421 BLAKE2B 82cd66e33c04192b497276a38a0e15fa6123e9e2b4b8333082c5609542058eb2c93ddcb50a9c4a60a4131e3154f13d911a7ae6129c0f5e109db60fa0b43aeacd SHA512 64a535a27df11f2b4246abd11d3f9bdfffd930d518817191079adecab5be77eee8244b540af0836ed7ae09973e888dd6821cef6535ccfbf58c8013138ef90c8f
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/dropdown-list/dropdown-list-20120329.ebuild b/app-emacs/dropdown-list/dropdown-list-20120329.ebuild
new file mode 100644
index 000000000000..0518265c4411
--- /dev/null
+++ b/app-emacs/dropdown-list/dropdown-list-20120329.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Drop-down menu interface"
+HOMEPAGE="https://www.emacswiki.org/emacs/dropdown-list.el"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ELISP_PATCHES="${PN}-20090814-selection-face.patch"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/dropdown-list/files/50dropdown-list-gentoo.el b/app-emacs/dropdown-list/files/50dropdown-list-gentoo.el
new file mode 100644
index 000000000000..f6abfe2f993a
--- /dev/null
+++ b/app-emacs/dropdown-list/files/50dropdown-list-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'dropdown-list "dropdown-list")
diff --git a/app-emacs/dropdown-list/files/dropdown-list-20090814-selection-face.patch b/app-emacs/dropdown-list/files/dropdown-list-20090814-selection-face.patch
new file mode 100644
index 000000000000..7c8adc3bf653
--- /dev/null
+++ b/app-emacs/dropdown-list/files/dropdown-list-20090814-selection-face.patch
@@ -0,0 +1,13 @@
+http://code.google.com/p/yasnippet/issues/detail?id=23
+
+--- dropdown-list.el~
++++ dropdown-list.el
+@@ -69,7 +69,7 @@
+ "*Bla." :group 'dropdown-list)
+
+ (defface dropdown-list-selection-face
+- '((t :inherit dropdown-list :background "purple"))
++ '((t :inherit dropdown-list-face :background "purple"))
+ "*Bla." :group 'dropdown-list)
+
+ (defvar dropdown-list-overlays nil)
diff --git a/app-emacs/dropdown-list/metadata.xml b/app-emacs/dropdown-list/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/dropdown-list/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/dts-mode-0.1.0_pre20141014 b/app-emacs/dts-mode-0.1.0_pre20141014
deleted file mode 100644
index 3277c6e688ba..000000000000
--- a/app-emacs/dts-mode-0.1.0_pre20141014
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major mode for devicetree sources
-EAPI=5
-HOMEPAGE=https://github.com/bgamari/dts-mode
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/dts-mode-0.1.0_pre20141014.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=85b972ed67c33605e4b244ebb3371317
diff --git a/app-emacs/dts-mode/Manifest b/app-emacs/dts-mode/Manifest
new file mode 100644
index 000000000000..19a87876ce15
--- /dev/null
+++ b/app-emacs/dts-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50dts-mode-gentoo.el 304 BLAKE2B 1ec26155386af1029c583b7624df22b8d68bc6150a9293860b9249b5a9212c0bec49610d7b5cc78b730361d55cd19cdb1176925bb496da649d30587511eeab6e SHA512 141a7719e5f348bee8ea96de99428b538d81217b274246c9ee2cc992c5f85637684757c0cc5653072c7182aad2c020eb6d639e0821ef97c830a071107c60c1bf
+DIST dts-mode-0.1.0_pre20141014.tar.xz 1944 BLAKE2B 352a8a3e3430a5684e440b5b930990094bba6db6cc653be792725bdfdc7cec6ffcbd0a7b1fc138ab2edde274ea77e46dfddb5f3479faa7ac8137d82acbfcc978 SHA512 81679f83dfe8e9d2f5b9314cd16615ca79c16e36468c41f5d499584f08ddda73f6cd3c6b6bef3251129e292884e18b8615a0a5cec2c2ea0146718e784f0c210c
+EBUILD dts-mode-0.1.0_pre20141014.ebuild 411 BLAKE2B 10272df88984326b8c655786409f44fe501e93f65d27055a2e49573fd9e1b03e68927274e735d7bf00be7a5533036d4db536d73bd5de08565a600ea698e7295b SHA512 9c6f24d138b9e8271573321fc12daa4e7472ad401204b0bb5a6d2d20e23a7a7a1ed2c5ce21c82185d3c03b17518bb2324c1c2d80ebbf813600d5122aa2f2ac65
+MISC metadata.xml 361 BLAKE2B 3bd75a162b82898dcfee713aaa9e505e0cbad0324e763aa565fb74c59101dfcc5a3cfa99ed22cde2192eb7e14cb8be44942aa1ff0ec83031643aabb7cee5cbec SHA512 856dceb88b29acc604ecf934b1fb02733b6737d6afdce6e76a24cd31ff6756a9e33e84cb2df4aef1ab969c4c3a404618ee7ad26e6ed9f2651b7ba14ce32b5153
diff --git a/app-emacs/dts-mode/dts-mode-0.1.0_pre20141014.ebuild b/app-emacs/dts-mode/dts-mode-0.1.0_pre20141014.ebuild
new file mode 100644
index 000000000000..aae773f78026
--- /dev/null
+++ b/app-emacs/dts-mode/dts-mode-0.1.0_pre20141014.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for devicetree sources"
+HOMEPAGE="https://github.com/bgamari/dts-mode"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.mkd"
diff --git a/app-emacs/dts-mode/files/50dts-mode-gentoo.el b/app-emacs/dts-mode/files/50dts-mode-gentoo.el
new file mode 100644
index 000000000000..6d2bbc99b298
--- /dev/null
+++ b/app-emacs/dts-mode/files/50dts-mode-gentoo.el
@@ -0,0 +1,6 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'dts-mode "dts-mode" "Major mode for editing Devicetrees" t)
+
+;; Separate entries in dts-mode.el itself, don't merge them into a single one.
+(add-to-list 'auto-mode-alist '("\\.dts\\'" . dts-mode))
+(add-to-list 'auto-mode-alist '("\\.dtsi\\'" . dts-mode))
diff --git a/app-emacs/dts-mode/metadata.xml b/app-emacs/dts-mode/metadata.xml
new file mode 100644
index 000000000000..86db30e765e7
--- /dev/null
+++ b/app-emacs/dts-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">bgamari/dts-mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/ebuild-mode-1.42 b/app-emacs/ebuild-mode-1.42
deleted file mode 100644
index a2d2964bb156..000000000000
--- a/app-emacs/ebuild-mode-1.42
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.42.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=398f669a0cd34008ddd8fba2ce5a3bde
diff --git a/app-emacs/ebuild-mode-1.43 b/app-emacs/ebuild-mode-1.43
deleted file mode 100644
index 0f0b9c90d6fa..000000000000
--- a/app-emacs/ebuild-mode-1.43
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.43.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=af23a76fb885ac02cbee74018c5ee2b8
diff --git a/app-emacs/ebuild-mode-1.44 b/app-emacs/ebuild-mode-1.44
deleted file mode 100644
index 9243fcd1d7a4..000000000000
--- a/app-emacs/ebuild-mode-1.44
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/emacs-23
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/texinfo
-DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.44.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=ed28283578474c330cb478200e3eb7f7
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
new file mode 100644
index 000000000000..2e7d18d65572
--- /dev/null
+++ b/app-emacs/ebuild-mode/Manifest
@@ -0,0 +1,8 @@
+AUX 50ebuild-mode-gentoo-1.39.el 805 BLAKE2B 3cdb41677c5ef11ef6fb44001cc36b58f923c2be4090fe8635fa85d338af3d170b1ad3d6b2f31704cf24e1528d3ce9b6fd3d305c2e3c1b1923e345e011642307 SHA512 8038b7bac0f3322b1149467152790dac7cd133234afe7c362c0e14686e378bc27eaf432a7194e1748dda80b41483943facb44e1a66466ebdcb4e7a0768e8f629
+DIST ebuild-mode-1.42.tar.xz 34936 BLAKE2B dd94d17dc57e2d32b329ab62ec6eec8ada6a4aeddadb8d978736f5dcb4d613759fd860043cab92d12db11614f8b7fa71fc5537576a2af3f5e6c9d56fc2fdcc05 SHA512 119f954eaf009bd0c9f0a75810b94a54d65ed91c6ffef20dd164c7a5ef095410dd0f3642426817f5efa6623d4f3e120ed3b27076222b02a90e75a83bb80b8703
+DIST ebuild-mode-1.43.tar.xz 34688 BLAKE2B 577900e2fa7ccb2362ec7f9046affb58e92bdfde44f2ea48274ba61d65f35fa6a1852bda6d9c64bd3f63aba99df244b4cb3378de079259508b149cdacf7caf28 SHA512 91f9a06de6feeeadb27d765a6ca6f2fa17e01938a6c953efe3586646f1bf48da87fe269ee9b07b2e16199d3ba4a76f42b8be9143218b808fac2971fc6f64f36d
+DIST ebuild-mode-1.44.tar.xz 34468 BLAKE2B 05c420979c2e4e145ab6230e9218d2ace8250abcc07e819610e9ac1fbb86147a641b88e69328ff624f9787b87cef56f9fe02a1205a02d01a0157b0293656647e SHA512 4d9b01939af089794255faf747264f948b8b2df47936e364ccfa23da493a33f56fbce1277526089e60b716e38e248b12fac39eca0d59d4974e2e70236ffbcd44
+EBUILD ebuild-mode-1.42.ebuild 732 BLAKE2B d80092df36e90cc356b7b0c3ae66405a08c5aab836f046ab9ddc268abb79766ed011ea390d0356f56555026af132d0b8d9be6f14c0eb82d3c09bd4835168e57f SHA512 fa0f2767f3eb6a4a5c94b9f633f4b3f778cd956f3995e5452b4c7548b6a79d9068f3d89e916aea696b34cf763c8754a193a546f35d7f7c9710b2eecb43853e2c
+EBUILD ebuild-mode-1.43.ebuild 748 BLAKE2B bfa78ba46b43271570ec44f42ab4dc506f93608b5237e884f6aba76458d7ea1bf58019a74c5c82ac0e0a48d71cce1f1073c86fe2b1f036d62ca4284db323b285 SHA512 9daa72324659b956e08565fae7953da567ef67c77c91a6b06b4f6228a2bf2714db3bb1e267ddbcf2b82998c87cee0bc37cfc6c88fc360a4c73febabbd95a801f
+EBUILD ebuild-mode-1.44.ebuild 748 BLAKE2B 6db0a7b028c513c130f665594a65ea28bcc6f3f712729877d6ee2e5401c3c86a1d9f51639332a5ff365143ebaa205ea8f15a7f7c4dff02751c845bbdc892d55a SHA512 b3e406f615844cfbe5a236f76ca993682c93da0fbacf928a7d951a8f3c9ed057822a900a4c7eca131e343e21697ff4ca9cf5f1b3d7ce721fde81c3f11706599d
+MISC metadata.xml 426 BLAKE2B d0b4dc2bd01fc6fb2f0c58b01676b80d09a4677876adc9681c3c436ebc437b6b034187b19fea30cf980927fec1f6a9feee9a0b7d1a4dd15818d02e4c8ec77af6 SHA512 058df2768030185953c7ac3622819c430681eae3ca60b0d02ad48ed22ab6a0ac7c169d93f8f54a3dddcade3f84c9bf58f662a58bfd78217ea8fc27a580ab9077
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
new file mode 100644
index 000000000000..fe2cc0744917
--- /dev/null
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1 elisp
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="sys-apps/texinfo"
+
+DOCS="ChangeLog keyword-generation.sh"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo-1.39.el"
+DOC_CONTENTS="Some optional features may require installation of additional
+ packages, like dev-python/docutils-glep for glep."
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.43.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.43.ebuild
new file mode 100644
index 000000000000..f36b2533c5f9
--- /dev/null
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.43.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="sys-apps/texinfo"
+
+DOCS="ChangeLog keyword-generation.sh"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo-1.39.el"
+DOC_CONTENTS="Some optional features may require installation of additional
+ packages, like dev-python/docutils-glep for glep."
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.44.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.44.ebuild
new file mode 100644
index 000000000000..3e82ece8f10e
--- /dev/null
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.44.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="sys-apps/texinfo"
+
+DOCS="ChangeLog keyword-generation.sh"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo-1.39.el"
+DOC_CONTENTS="Some optional features may require installation of additional
+ packages, like dev-python/docutils-glep for glep."
diff --git a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.39.el b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.39.el
new file mode 100644
index 000000000000..8683a654d3f4
--- /dev/null
+++ b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.39.el
@@ -0,0 +1,16 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'ebuild-mode "ebuild-mode"
+ "Major mode for Portage .ebuild and .eclass files." t)
+(autoload 'gentoo-newsitem-mode "gentoo-newsitem-mode"
+ "Major mode for Gentoo GLEP 42 news items." t)
+(autoload 'glep-mode "glep-mode"
+ "Major mode for Gentoo Linux Enhancement Proposals." t)
+
+(add-to-list 'auto-mode-alist '("\\.\\(ebuild\\|eclass\\)\\'" . ebuild-mode))
+(add-to-list 'auto-mode-alist
+ '("/[0-9]\\{4\\}-[01][0-9]-[0-3][0-9]-.+\\.[a-z]\\{2\\}\\.txt\\'"
+ . gentoo-newsitem-mode))
+(add-to-list 'auto-mode-alist '("/glep.*\\.rst\\'" . glep-mode))
+(add-to-list 'interpreter-mode-alist '("openrc-run" . sh-mode))
+(add-to-list 'interpreter-mode-alist '("runscript" . sh-mode))
+(modify-coding-system-alist 'file "\\.\\(ebuild\\|eclass\\)\\'" 'utf-8)
diff --git a/app-emacs/ebuild-mode/metadata.xml b/app-emacs/ebuild-mode/metadata.xml
new file mode 100644
index 000000000000..0f04e4d39a79
--- /dev/null
+++ b/app-emacs/ebuild-mode/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <maintainer status="active">
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+ </maintainer>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/ecb-2.41_pre20140215-r1 b/app-emacs/ecb-2.41_pre20140215-r1
deleted file mode 100644
index ae559b41c7c5..000000000000
--- a/app-emacs/ecb-2.41_pre20140215-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=!!<app-emacs/cedet-2.0 java? ( app-emacs/jde ) >=virtual/emacs-23
-DESCRIPTION=Source code browser for Emacs
-EAPI=5
-HOMEPAGE=http://ecb.sourceforge.net/
-IUSE=java
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2+
-RDEPEND=!!<app-emacs/cedet-2.0 java? ( app-emacs/jde ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ecb-2.41_pre20140215.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=abe352e66741b4c385c2c8c751a849cd
diff --git a/app-emacs/ecb/Manifest b/app-emacs/ecb/Manifest
new file mode 100644
index 000000000000..8a1d748bb17d
--- /dev/null
+++ b/app-emacs/ecb/Manifest
@@ -0,0 +1,5 @@
+AUX 70ecb-gentoo.el 63 BLAKE2B aafdd070c44a1f7f4aad23ee1d0ff39f1816bb46fa1e667ef12eb276d1877ca18a81c43ae66c285574b85a089255e6613c92dbe751d382280b42613976829cae SHA512 984cfbfa398bd60008dee83721a55f5c6cad0a71caf0d7cc194a84f0d7c061a9a99398e40e90f0a9cf79d2ff689e374c860612bea16e9fa0049d7a82edc56283
+AUX ecb-2.32-gentoo.patch 3430 BLAKE2B 8d373b5ebc1064d5b2fb713f6d3bc31ec34eddfeb9b9519e655bdaab0ced4e4c4aaca03b3013d0daeceaca20f9210625b84d76264be24d9ea99a5745336c0f06 SHA512 1902cec83e62c9b65a62a1fd4a7c8e2ae309b3bd2217b6f821a5a047cf3bdda24b9b5c68e672c1555196a7d28ce06c22398ef15c3c0e6b87bcce1e15d3c333fb
+DIST ecb-2.41_pre20140215.tar.xz 565404 BLAKE2B 135aa4a71bb41e78933604c5e549d8a163715061c7946e90a115cf802499f9a78884e554cbf4fd4edc9b5856b1f32b3189eb3e1e2537b16e5dd57cfe3ccd1ee3 SHA512 bf87bdd38e7ddaeec044fc56d56f7c456ef0a1922f50b962f932bf739895f046387bab7a934439e749fd7e838d9f742938408f4f9cb47079440abd8c1ba181b6
+EBUILD ecb-2.41_pre20140215-r1.ebuild 1226 BLAKE2B 1cdc2a77228d611fd8ffea0f7f7136d0fbe7a519a0ede55eb06e83a6fb1098ebf8314bc1aed6086bc129c9787bfa4f28654c1082fbe953b4e90a428da0f554d5 SHA512 9cf484eb1e4cd0a895eacd2730e0d991b62d6bb3187ba096583e2c6a091496efcfddd86db61368c8bc2e83acf7fe0716791dd6620ddfe3ea064fc93ca093bbaa
+MISC metadata.xml 1593 BLAKE2B 611c6e5a6f1bf4bcc78dcc3fd35e6e01067162d7fd4f6f0186f94011e9d4e154eb343189302713ec911fc70e00f603b08f2add5da2acf9272d5d3f90db1387e4 SHA512 613a3f9a08c5f467de2190b4de2a794c5f8cf8ff1fc3bca4328581be199799d01a312391176a6469643e4cfdf8aab757dce922115910f282931783993d81e392
diff --git a/app-emacs/ecb/ecb-2.41_pre20140215-r1.ebuild b/app-emacs/ecb/ecb-2.41_pre20140215-r1.ebuild
new file mode 100644
index 000000000000..1a427bfba276
--- /dev/null
+++ b/app-emacs/ecb/ecb-2.41_pre20140215-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp eutils
+
+DESCRIPTION="Source code browser for Emacs"
+HOMEPAGE="http://ecb.sourceforge.net/"
+# snapshot of https://github.com/alexott/ecb.git, created with "make distrib"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="java"
+
+DEPEND="!!<app-emacs/cedet-2.0
+ java? ( app-emacs/jde )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+SITEFILE="70${PN}-gentoo.el"
+DOC_CONTENTS="ECB is autoloaded in site-gentoo.el. Add the line
+ \n\t(require 'ecb)
+ \nto your ~/.emacs file to enable all features on Emacs startup."
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.32-gentoo.patch"
+ sed -i -e "s:@PF@:${PF}:" ecb-help.el || die "sed failed"
+}
+
+src_compile() {
+ local loadpath="" sl=${EPREFIX}${SITELISP}
+ if use java; then
+ loadpath="${sl}/elib ${sl}/jde ${sl}/jde/lisp"
+ fi
+
+ emake LOADPATH="${loadpath}"
+}
+
+src_install() {
+ elisp_src_install
+
+ insinto "${SITEETC}/${PN}"
+ doins -r ecb-images
+
+ doinfo info-help/ecb.info*
+ dohtml html-help/*.html
+ dodoc NEWS README RELEASE_NOTES
+}
diff --git a/app-emacs/ecb/files/70ecb-gentoo.el b/app-emacs/ecb/files/70ecb-gentoo.el
new file mode 100644
index 000000000000..bc71f7c18e94
--- /dev/null
+++ b/app-emacs/ecb/files/70ecb-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'ecb-autoloads)
diff --git a/app-emacs/ecb/files/ecb-2.32-gentoo.patch b/app-emacs/ecb/files/ecb-2.32-gentoo.patch
new file mode 100644
index 000000000000..09d3d86afdcd
--- /dev/null
+++ b/app-emacs/ecb/files/ecb-2.32-gentoo.patch
@@ -0,0 +1,73 @@
+Change default paths to Gentoo install locations.
+Allow for compressed Info files.
+
+--- ecb-2.32-orig/ecb-common-browser.el 2005-07-11 16:16:01.000000000 +0200
++++ ecb-2.32/ecb-common-browser.el 2009-03-03 09:42:51.000000000 +0100
+@@ -261,10 +261,7 @@
+ ;; additonal images are necessary - but currently i don't think we need
+ ;; special images for this analyse-stuff.
+ (defcustom ecb-tree-image-icons-directories
+- (let ((base (concat (if ecb-regular-xemacs-package-p
+- (format "%s" (locate-data-directory "ecb"))
+- ecb-ecb-dir)
+- "ecb-images/")))
++ (let ((base "/usr/share/emacs/etc/ecb/ecb-images/"))
+ (cons (concat base "default/height-17")
+ (mapcar (function (lambda (i)
+ (cons (car i) (concat base (cdr i)))))
+--- ecb-2.32-orig/ecb-help.el 2005-07-11 16:16:00.000000000 +0200
++++ ecb-2.32/ecb-help.el 2009-03-03 09:47:49.000000000 +0100
+@@ -81,16 +81,8 @@
+ (const :tag "Html" :value html)))
+
+
+-(defcustom ecb-help-info-path (concat
+- (if ecb-running-xemacs
+- (if (file-exists-p
+- (concat ecb-ecb-dir
+- ecb-help-info-subdir
+- ecb-help-info-start-file))
+- ecb-help-info-subdir
+- "../../info/")
+- ecb-help-info-subdir)
+- ecb-help-info-start-file)
++(defcustom ecb-help-info-path
++ (concat "/usr/share/info/" ecb-help-info-start-file)
+ "*Path where the ECB online help in info format resides.
+ This must be the location of the file \"ecb.info\" which comes with the ECB
+ distribution. If is installed by unpacking the archive available on the ECB
+@@ -107,24 +99,7 @@
+ :type 'file)
+
+ (defcustom ecb-help-html-path
+- (if (not ecb-running-xemacs)
+- (concat ecb-help-html-subdir ecb-help-html-start-file)
+- (cond ((file-exists-p
+- (concat ecb-ecb-dir
+- ecb-help-html-subdir
+- ecb-help-html-start-file))
+- (concat ecb-help-html-subdir ecb-help-html-start-file))
+- ((file-exists-p
+- (concat ecb-ecb-dir
+- "../../html/"
+- ecb-help-html-start-file))
+- (concat "../../html/" ecb-help-html-start-file))
+- ((file-exists-p
+- (concat ecb-ecb-dir
+- "../../html/ecb/index.html"))
+- "../../html/ecb/index.html")
+- (t
+- (concat "../../etc/ecb/html/" ecb-help-html-start-file))))
++ (concat "/usr/share/doc/@PF@/html/" ecb-help-html-start-file)
+ "*Path where the ECB online help in HTML format resides.
+ This must be the location of the file \"index.html\" which comes with the ECB
+ distribution. If is installed by unpacking the archive available on the ECB
+@@ -145,7 +120,7 @@
+ "Starts `info' with INFO-FILE. If INFO-FILE does not exists then nil is
+ returned otherwise true. If NO-FILE-NOT-EXIST-ERR is not nil then just nil is
+ returned if INFO-FILE does not exist otherwise an error is reported."
+- (if (file-exists-p info-file)
++ (if (file-expand-wildcards (concat info-file "*"))
+ (prog1 t
+ (info info-file))
+ (unless no-file-not-exist-err
diff --git a/app-emacs/ecb/metadata.xml b/app-emacs/ecb/metadata.xml
new file mode 100644
index 000000000000..842f361ee663
--- /dev/null
+++ b/app-emacs/ecb/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ ECB stands for "Emacs Code Browser". While Emacs already has good editing
+ support for many modes, its browsing support is somewhat lacking. That's
+ where ECB comes in: it displays a number of informational windows that allow
+ for easy source code navigation and overview.
+
+ The informational windows can contain:
+
+ * A directory tree,
+ * a list of source files in the current directory,
+ * a list of functions/classes/methods/... in the current file, (ECB uses
+ the Semantic Bovinator, or Imenu, or etags, for getting this list so all
+ languages supported by any of these tools are automatically supported by
+ ECB too),
+ * a history of recently visited files,
+ * the Speedbar and
+ * output from compilation (the compilation window) and other modes like
+ help, grep etc. or whatever a user defines to be displayed in this
+ window.
+
+ As an added bonus, ECB makes sure to keep these informational windows
+ visible, even when you use C-x 1 and similar commands.
+
+ It goes without saying that you can configure the layout, ie. which
+ informational windows should be displayed where. ECB comes with a number of
+ ready-made window layouts to choose from.
+</longdescription>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">ecb</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/edb-1.31 b/app-emacs/edb-1.31
deleted file mode 100644
index 12a3325351ed..000000000000
--- a/app-emacs/edb-1.31
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=EDB, The Emacs Database
-EAPI=5
-HOMEPAGE=http://www.gnuvola.org/software/edb/ https://www.emacswiki.org/emacs/EmacsDataBase
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-3+ Texinfo-manual
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.gnuvola.org/software/edb/edb-1.31.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=3cbae0835a6c0f2d3c5132285b4fac23
diff --git a/app-emacs/edb-1.32 b/app-emacs/edb-1.32
deleted file mode 100644
index a1ba90e2bca2..000000000000
--- a/app-emacs/edb-1.32
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=EDB, The Emacs Database
-EAPI=6
-HOMEPAGE=http://www.gnuvola.org/software/edb/ https://www.emacswiki.org/emacs/EmacsDataBase
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-3+ Texinfo-manual
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.gnuvola.org/software/edb/edb-1.32.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=5685dde303cd36eb202869f846564224
diff --git a/app-emacs/edb/Manifest b/app-emacs/edb/Manifest
new file mode 100644
index 000000000000..fbb72fd94d40
--- /dev/null
+++ b/app-emacs/edb/Manifest
@@ -0,0 +1,7 @@
+AUX 50edb-gentoo.el 212 BLAKE2B a56c87b00e29d06901284a20f2458d32608d54f27737b9c67d38c051de54c02fba21c4ba3aa968af7aec5807a2f10882fa871ec482722fc80910cb191e7f51fe SHA512 cf320088e7597de4b15fbd697048a5a5b39bfc75ecb6a22747c853f0a067f10dcad39b828207ec8fe81f58617a36b929bd92aadcbf7a5abfb54278f0d31489ec
+AUX edb-1.31-skram-path.patch 396 BLAKE2B 90969cc1acdff236a2494312fb536b1acb7e991e605dd698cb2e5f25405b3a8bf2866d868d7bdc49c09546660c1cefe09fea63bc09709ecd31d3c37194b56ec8 SHA512 f54d3b6c3483a4765dedf60f6cad6f3c1247845ff116f70be791e3ad2674e1352f204a5d865142d70d4bc9c82e25d42f7fccd2b1514aed46e6dbb391002eff8f
+DIST edb-1.31.tar.gz 585728 BLAKE2B ffe1ef3171724b1c608d347393955615a48737230f7493e22c48504134682d1c73397e1e559708f16ab2284a17b4b6baff7dbb15e255511b6ed5d07d6a22e249 SHA512 99af00f1e876b490205e9c3b1807d0af0efcd9a5bff018629f00e36d1572f7d05e979d6bfb50f9c15edfe3ad5382fa6f6171f13c638f3143ece53790bdaa31c3
+DIST edb-1.32.tar.gz 692581 BLAKE2B 3f77d6f9d6550ce1c064dc0820fdc9a24293964900d4f390ad1456e79f42444d7c9512585cf230d742e66360011e2e314446748e23395bee1e7f8086c38853b7 SHA512 ee8bd642c019d30401202f540b37f28c914c17083123ca61b741de72d168ecb855d0508f922af208bb717b02b4819cf6f3c5137d589f2e858410a3e9ab4034e0
+EBUILD edb-1.31.ebuild 783 BLAKE2B 788badf399ac23d39dd3a5494c24b74ccb663175220359cfffe44d336b601ecb34438423bde09cbe076e8d10399e30c317630c236198afcf2de743a7bff4d45a SHA512 030d7a4378f971e02de0fc4fd661c97c012b594ed164c37606c4f6e79bc4ec6c600cc4b0684c24e48f3509f9f5a05bab692077d4231f1f7f0e117a16363473d7
+EBUILD edb-1.32.ebuild 745 BLAKE2B 7414162ff1e3c34cbb3cb05db6e685c348e2700054b991056512135a06da06e0af0fca5b8f4603b41b6dae03ae462962e73ac95b2a981a4354027cba7599ebd6 SHA512 e2c8e63bef73b03eb1d4a8de56dd80c5f8799e559808a59acc8b90ca6297bb1884ffdad6ffd50eb6e4723ef8f4df2e76bdb24655b30615336682540bb4f8e9e4
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/edb/edb-1.31.ebuild b/app-emacs/edb/edb-1.31.ebuild
new file mode 100644
index 000000000000..f635e268cc2b
--- /dev/null
+++ b/app-emacs/edb/edb-1.31.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="EDB, The Emacs Database"
+HOMEPAGE="http://www.gnuvola.org/software/edb/
+ https://www.emacswiki.org/emacs/EmacsDataBase"
+SRC_URI="http://www.gnuvola.org/software/edb/${P}.tar.gz"
+
+LICENSE="GPL-3+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+ELISP_PATCHES="${P}-skram-path.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+ default
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ emake -j1 \
+ sitelisp="${ED}${SITELISP}" \
+ infodir="${ED}/usr/share/info" \
+ install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc AUTHORS BUGS ChangeLog HACKING NEWS README THANKS TODO doc/refcard.ps
+ dodoc -r examples
+}
diff --git a/app-emacs/edb/edb-1.32.ebuild b/app-emacs/edb/edb-1.32.ebuild
new file mode 100644
index 000000000000..48f3028985d7
--- /dev/null
+++ b/app-emacs/edb/edb-1.32.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="EDB, The Emacs Database"
+HOMEPAGE="http://www.gnuvola.org/software/edb/
+ https://www.emacswiki.org/emacs/EmacsDataBase"
+SRC_URI="http://www.gnuvola.org/software/edb/${P}.tar.gz"
+
+LICENSE="GPL-3+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+ default
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ emake -j1 \
+ sitelisp="${ED}${SITELISP}" \
+ infodir="${ED}/usr/share/info" \
+ install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc AUTHORS BUGS ChangeLog HACKING NEWS README THANKS TODO doc/refcard.ps
+ dodoc -r examples
+}
diff --git a/app-emacs/edb/files/50edb-gentoo.el b/app-emacs/edb/files/50edb-gentoo.el
new file mode 100644
index 000000000000..a2670b65ba31
--- /dev/null
+++ b/app-emacs/edb/files/50edb-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'db-find-file "database" "EDB database package" t)
+(autoload 'edb-interact "database" "EDB database package" t)
+(defalias 'edb-EXPERIMENTAL-interact 'edb-interact)
diff --git a/app-emacs/edb/files/edb-1.31-skram-path.patch b/app-emacs/edb/files/edb-1.31-skram-path.patch
new file mode 100644
index 000000000000..75921ca00160
--- /dev/null
+++ b/app-emacs/edb/files/edb-1.31-skram-path.patch
@@ -0,0 +1,11 @@
+--- edb-1.31-orig/skram/GNUmakefile.in
++++ edb-1.31/skram/GNUmakefile.in
+@@ -48,7 +48,7 @@
+ #
+ # Until that change is distributed, here is a workaround:
+ wily-emacs = $(ebatch) \
+- --eval '(add-to-list (quote load-path) (expand-file-name "$(topdir)"))' \
++ --eval '(add-to-list (quote load-path) (expand-file-name "$(topdir)/lisp"))' \
+ --eval '(require (quote database))'
+
+ sk2: skram.data
diff --git a/app-emacs/edb/metadata.xml b/app-emacs/edb/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/edb/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/edit-list-0.3 b/app-emacs/edit-list-0.3
deleted file mode 100644
index 1d031a2f7d95..000000000000
--- a/app-emacs/edit-list-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Edit a single list
-EAPI=5
-HOMEPAGE=http://mwolson.org/projects/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/edit-list-0.3.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=5d539a6ee458ce78acfc32033f419aba
diff --git a/app-emacs/edit-list/Manifest b/app-emacs/edit-list/Manifest
new file mode 100644
index 000000000000..612b86037bd6
--- /dev/null
+++ b/app-emacs/edit-list/Manifest
@@ -0,0 +1,4 @@
+AUX 50edit-list-gentoo.el 122 BLAKE2B ee35de192d38fa23b662045130afcfa84334e9143b70cd13d6279849667f6b4ebdfd428d0519071475d7db826933ceafd814bb1872cc5b76eb8e9892d6a836a2 SHA512 7f7404c402f4b5208ac1bc786b554629eb616d99dc97ed55256f22405f8e27815215f8c47e2c15f1b2d90f64da464df41f5a20905e76856eddbd2f9e414bed64
+DIST edit-list-0.3.el.bz2 2072 BLAKE2B f6e98b44a6ba73bc727d5725c58756d4dd70017831deb184ed1e7f40697fac37d3b7a7a78dbc51218b5b2cca924702032ba29f5d42b3c814edd6b4d64f31ecaf SHA512 f7441d42e95b46d0cefd5cc32af5c0738aa15b338b81e31dc89fa968fc34e6387b6bc927999f4e077632acf6c2edcbbac609eb066363db896099f5fa3e19c1e7
+EBUILD edit-list-0.3.ebuild 407 BLAKE2B cee6a86c10ee37e586635765883b0b5cfe09e84232b1c109f9194f3d5b4243931b992438574cb09fa48a77a9421421cdc9782e77f498085e7aa2d20ba905cb1a SHA512 e2efc21dfcd7595fd5ccf6a852b077362526cf661772d3e0b33473d7ce042ff5ec47a44fe0597be533137368b05c88c20e3536bfd76637aa7340ce99421a9a72
+MISC metadata.xml 585 BLAKE2B b4accf8c31a949e6efd60706ad95e3407be89fbb6c2ca8b6d5673fdb97d1fe7d299d8340d7688d0a6733ede719e5b74759adbc635d2119f46b431e83c12f5ede SHA512 967a12a75ad279a00131ad923315c3565189e93116500955bd45ec153f7d224e2d202d0e526e9a0496aaafa591a06875bd17adfed2dbe040c98551bf1f636b90
diff --git a/app-emacs/edit-list/edit-list-0.3.ebuild b/app-emacs/edit-list/edit-list-0.3.ebuild
new file mode 100644
index 000000000000..01ef68801bd6
--- /dev/null
+++ b/app-emacs/edit-list/edit-list-0.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Edit a single list"
+HOMEPAGE="http://mwolson.org/projects/"
+# taken from http://mwolson.org/static/dist/elisp/edit-list.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/edit-list/files/50edit-list-gentoo.el b/app-emacs/edit-list/files/50edit-list-gentoo.el
new file mode 100644
index 000000000000..ec4d1975e3bc
--- /dev/null
+++ b/app-emacs/edit-list/files/50edit-list-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'edit-list "edit-list"
+ "Edit a list called LIST-NAME interactively." t)
diff --git a/app-emacs/edit-list/metadata.xml b/app-emacs/edit-list/metadata.xml
new file mode 100644
index 000000000000..6513eb7668ac
--- /dev/null
+++ b/app-emacs/edit-list/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ So you've just added an incorrect entry to auto-mode-alist and want to fix
+ it quickly. `M-x edit-list RET auto-mode-alist RET' to the rescue. Make your
+ changes and hit either `C-x C-s' or `C-c C-c' when done. Or just kill the
+ buffer if you change your mind.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/edit-server-1.15 b/app-emacs/edit-server-1.15
deleted file mode 100644
index a77e0a7b30a0..000000000000
--- a/app-emacs/edit-server-1.15
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=virtual/emacs-23
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=Service edit requests from a web browser for editing of textareas
-EAPI=7
-HOMEPAGE=https://github.com/stsquad/emacs_chrome
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/stsquad/emacs_chrome/archive/v1.15.tar.gz -> emacs_chrome-1.15.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=c4ba721291f40f8820688ec4f7d711c4
diff --git a/app-emacs/edit-server/Manifest b/app-emacs/edit-server/Manifest
new file mode 100644
index 000000000000..2d5f7b87c13c
--- /dev/null
+++ b/app-emacs/edit-server/Manifest
@@ -0,0 +1,4 @@
+AUX 50edit-server-gentoo.el 109 BLAKE2B d2031df0e4749d59b84ea1d5d591345e53a850476865b3c3015debe7af8e9e07fb8827974c8eafd160ce19256a720190175822d72894e2365f19d6e141e2241b SHA512 cefe2c20f415d9f5f8e1dbb31bfca213f9ccb50d84d472770fd5833cac2885eaa0fa203802075dd4dcd822729173decf580508f504124e93578043f0384bc775
+DIST emacs_chrome-1.15.tar.gz 315059 BLAKE2B 12aee8ddabcaa2c843c6315e510f757a54495affcbdccc315199270270905b3c25409f6a0aee859e0d835e16f0c8c6dab18ee147cd82864d49a6f4e4942fb99e SHA512 c91c6785d92607b2e7f6bba20176048fe8893ac7e672d860ba3befc910825bbae478104b7ba53cd8253a4f354eb26bc0a993f23fed5888c3b8c9cdf00e116c30
+EBUILD edit-server-1.15.ebuild 542 BLAKE2B 3933284076b468bfe8b0feb235ab99dfd19aa3ad4aa28529d73b5d5f617776bb8da3457aed8a09e77a9e05931b04d4329d205a473b1c6ecb7f4979e998159946 SHA512 ed87f8e02c271c1a1007ae0bd8aa878cc41095d4fbc2367a2b2e1f5da5de426bd534c94df8f73979b1997e6ece53b34ec84de1ca70864443074a1d3b744fc310
+MISC metadata.xml 783 BLAKE2B 366f3f5893d9d9543f458984f240d7f3a9504001f85d0519f4568ff0ac1609ae6f32bc4cae5e52f1691dd4ed23691a7c1e53feab8f509a864bb8f65388e105c3 SHA512 202ed4c24086e75f97dd6bf805c58080d0bc612525462ee37b438b0021c9b359a4db286389a6a5335b53e14a078fb28e2ab91692031e861c0931476dfd79995f
diff --git a/app-emacs/edit-server/edit-server-1.15.ebuild b/app-emacs/edit-server/edit-server-1.15.ebuild
new file mode 100644
index 000000000000..50ca006ea9ec
--- /dev/null
+++ b/app-emacs/edit-server/edit-server-1.15.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+MY_PN="emacs_chrome"
+DESCRIPTION="Service edit requests from a web browser for editing of textareas"
+HOMEPAGE="https://github.com/stsquad/emacs_chrome"
+SRC_URI="https://github.com/stsquad/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}/servers"
+ELISP_REMOVE="edit-server-ert.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README"
diff --git a/app-emacs/edit-server/files/50edit-server-gentoo.el b/app-emacs/edit-server/files/50edit-server-gentoo.el
new file mode 100644
index 000000000000..42beafcc3e99
--- /dev/null
+++ b/app-emacs/edit-server/files/50edit-server-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'edit-server-start "edit-server" "Start the edit server." t)
diff --git a/app-emacs/edit-server/metadata.xml b/app-emacs/edit-server/metadata.xml
new file mode 100644
index 000000000000..6a462dde2a9a
--- /dev/null
+++ b/app-emacs/edit-server/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ Edit with Emacs is an addon for webextension compatible browsers
+ like Google's Chrome(ium), Opera or Firefox that allows you to edit
+ text areas on your browser in a more full featured editor. It does
+ this in conjunction with an "Edit Server" which services requests by
+ the browser. This is because extensions cannot spawn new processes
+ as a security measure.
+
+ The extension packages a native elisp version that can be run inside
+ GNU Emacs itself.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/editorconfig-emacs-0.7.8-r1 b/app-emacs/editorconfig-emacs-0.7.8-r1
deleted file mode 100644
index f74c6be5aaa6..000000000000
--- a/app-emacs/editorconfig-emacs-0.7.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/emacs-23
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=EditorConfig plugin for emacs
-EAPI=7
-HOMEPAGE=https://github.com/editorconfig/editorconfig-emacs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/editorconfig/editorconfig-emacs/archive/v0.7.8.tar.gz -> editorconfig-emacs-0.7.8.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=ab4acc1125badd8a54276903d4f6b1a4
diff --git a/app-emacs/editorconfig-emacs/Manifest b/app-emacs/editorconfig-emacs/Manifest
new file mode 100644
index 000000000000..99fa52f588a5
--- /dev/null
+++ b/app-emacs/editorconfig-emacs/Manifest
@@ -0,0 +1,4 @@
+AUX 50editorconfig-emacs-gentoo.el 315 BLAKE2B caefc75ef9a37e43d2a5de2f9c50a8f2992124fa98030080d5a5dc6c37490e1217e47595e4e894aa264568899d54891db8676348d10984327a4c596bcbf7b923 SHA512 66e86f6af9fa2feadc5477b6b7290320b2544219d8c099f74f94873fa4d4d45dd8f0dad17b14dcb455f1e18f1dd7606ade1ef77e0aff5708102ed5f35df81705
+DIST editorconfig-emacs-0.7.8.tar.gz 28250 BLAKE2B 8c09b7e495ff38d4276cdbaf60109f91b3e32215f2c6a8aceffd80a02cf024d79eac1739b3f2efa3697b78804da32d0cc2969db628d1064a0fb1db1b059a191d SHA512 21815a5a778ffef68b5205e409aa827c1bd6c9a8c542647ebec889a9f00f5b3f71e3a2072bc2f0373e8ce30c1bb57f5f6350953a3c149742a8e2e46ca9846c9a
+EBUILD editorconfig-emacs-0.7.8-r1.ebuild 648 BLAKE2B 613aad383cca044f944485ad202a062a33d21ed6d2a2b81e4d5e402055f58debefffa8888f2123849c31ae9091baf46755ad9c9d126ce41047da4f14ec791a0d SHA512 112c8a2861d5d845ce34107d02fde7f8d674930ae5c01cc9e6e868c3eff7bfaea74f4589774cb722c6f673f3bc11ac996425bbc212cbd246c0d2b4d86b013181
+MISC metadata.xml 460 BLAKE2B bde11fb17627dc46db6a53aa2ca4e76d2deacc9939c7c4abbf48751ffcfc5d07f1bad2c497fe2dbc1ddf0abd7b0eb9f3de165355d72caab22b3cfd3586303949 SHA512 4f2681813655765cf12d11c39e46edea3f5f2a40900e9e173f43e90e4f7304c0295351d06acc39fec5fa88079d9d305d0c24ca14ea42d601657708ea15302100
diff --git a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.7.8-r1.ebuild b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.7.8-r1.ebuild
new file mode 100644
index 000000000000..f79186d032e1
--- /dev/null
+++ b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.7.8-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="EditorConfig plugin for emacs"
+HOMEPAGE="https://github.com/editorconfig/editorconfig-emacs"
+SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # make test requires a git repo
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
+DOC_CONTENTS="The EditorConfig feature is not enabled as a site default.
+ Add the following line to your ~/.emacs file to activate it:
+ \n\t(editorconfig-mode 1)"
diff --git a/app-emacs/editorconfig-emacs/files/50editorconfig-emacs-gentoo.el b/app-emacs/editorconfig-emacs/files/50editorconfig-emacs-gentoo.el
new file mode 100644
index 000000000000..93d6816e8e7b
--- /dev/null
+++ b/app-emacs/editorconfig-emacs/files/50editorconfig-emacs-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'editorconfig-mode "editorconfig"
+ "Toggle EditorConfig feature." t)
+(autoload 'editorconfig-conf-mode "editorconfig-conf-mode"
+ "Major mode for editing .editorconfig files." t)
+(add-to-list 'auto-mode-alist
+ '("/\\.editorconfig\\'" . editorconfig-conf-mode))
diff --git a/app-emacs/editorconfig-emacs/metadata.xml b/app-emacs/editorconfig-emacs/metadata.xml
new file mode 100644
index 000000000000..65f408f2b6bf
--- /dev/null
+++ b/app-emacs/editorconfig-emacs/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <upstream>
+ <remote-id type="github">editorconfig/editorconfig-emacs</remote-id>
+ </upstream>
+ <maintainer type="person">
+ <email>zmedico@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/elib-1.0-r1 b/app-emacs/elib-1.0-r1
deleted file mode 100644
index 85f63142badc..000000000000
--- a/app-emacs/elib-1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=The Emacs Lisp Library
-EAPI=5
-HOMEPAGE=http://jdee.sourceforge.net
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://jdee.sunsite.dk/elib-1.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ee149b06afa1d9783e88a157d730cccb
diff --git a/app-emacs/elib/Manifest b/app-emacs/elib/Manifest
new file mode 100644
index 000000000000..e6d32f4eb4e7
--- /dev/null
+++ b/app-emacs/elib/Manifest
@@ -0,0 +1,5 @@
+AUX 50elib-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX elib-1.0-texinfo-5.patch 285 BLAKE2B 5197a5c52702222473d53fb16be156082af8da0e8ccc99f1e4818ec740e6ff1a4eb51984a57af19f3e44c32aa38c4c4006194ce7bcc36cb64085113fb0aaa1a6 SHA512 fb4656dd8dc80ffbb9a243f2d632e65a241c32d557283079b1552accb3d393c87eccbce735dbffff83d854618e1ac0d689448bc20c30eb4e4481eaedcd91ae81
+DIST elib-1.0.tar.gz 58335 BLAKE2B 7c2a976685cc23a73fce86d63f40a476d24551415d7427044ca9e5ab72df64043d8102db21394f66f2fdf2b98bdc336312d3754f16b891122cb1e170ff3fa62c SHA512 ca5d6e0861f3d8d049911a9e4455169263bd781992103baacadae560fce0fedddb734617338cb5fac51420fcb2035622042836fa7198fe7bec312a0015da266d
+EBUILD elib-1.0-r1.ebuild 761 BLAKE2B 7099e2fa2e01929a3fbd249dc6913652f8c80f123c60735791a43d5df9f7721b3b2718b6e1fd93d83f8af40eeb7fb4c999326f4bcaf3014dfe9b09ccf56ed269 SHA512 3172952cb5ad9db9f6d2772fd797d4a05553280585affe7c4eacdccb89ba6c728a6197ef0ca4450b10afeffae57bf6d9dedddc2780138dc208398f05c317b9db
+MISC metadata.xml 354 BLAKE2B aef8ad4bf36ab6414a09c3705f7275916e8b62db9697b3668be7c9cf8863aed6f7739f967cec9610081eb0e2831c891fb7a6f2b52c8438d8d0a4c1bae0d83ada SHA512 e7d4bf621b2869c868911ba0c15e53ed356a75e4797a4a2e81cb52476560d77613c9177e84473d63008a3e0b2e8b4c1fd51082373708b56c371e46318d1054d0
diff --git a/app-emacs/elib/elib-1.0-r1.ebuild b/app-emacs/elib/elib-1.0-r1.ebuild
new file mode 100644
index 000000000000..331d040e3477
--- /dev/null
+++ b/app-emacs/elib/elib-1.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp eutils
+
+DESCRIPTION="The Emacs Lisp Library"
+HOMEPAGE="http://jdee.sourceforge.net"
+SRC_URI="http://jdee.sunsite.dk/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-texinfo-5.patch"
+ sed -i 's:--infodir:--info-dir:g' Makefile || die
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ dodir "${SITELISP}/elib"
+ dodir /usr/share/info
+ emake prefix="${ED}/usr" infodir="${ED}/usr/share/info" install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc ChangeLog NEWS README TODO
+}
diff --git a/app-emacs/elib/files/50elib-gentoo.el b/app-emacs/elib/files/50elib-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/elib/files/50elib-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/elib/files/elib-1.0-texinfo-5.patch b/app-emacs/elib/files/elib-1.0-texinfo-5.patch
new file mode 100644
index 000000000000..53d18d248355
--- /dev/null
+++ b/app-emacs/elib/files/elib-1.0-texinfo-5.patch
@@ -0,0 +1,14 @@
+--- elib-1.0-orig/elib.texi
++++ elib-1.0/elib.texi
+@@ -33,9 +33,9 @@
+ @sp 4
+ @comment The title is printed in a large font.
+ @center @titlefont{User's Guide}
+-@sp
++@sp 1
+ @center @titlefont{to}
+-@sp
++@sp 1
+ @center @titlefont{Elib - The Emacs Lisp Library}
+ @sp 2
+ @center version 1.0
diff --git a/app-emacs/elib/metadata.xml b/app-emacs/elib/metadata.xml
new file mode 100644
index 000000000000..8269357eebf0
--- /dev/null
+++ b/app-emacs/elib/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">jdee</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/elscreen-1.4.6-r1 b/app-emacs/elscreen-1.4.6-r1
deleted file mode 100644
index 7030185fb35f..000000000000
--- a/app-emacs/elscreen-1.4.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/apel-10.8-r1 >=virtual/emacs-23
-DESCRIPTION=Frame configuration management for GNU Emacs modelled after GNU Screen
-EAPI=4
-HOMEPAGE=http://www.morishima.net/~naoto/j/software/elscreen/
-KEYWORDS=~alpha amd64 hppa ~ia64 ~ppc ~ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-emacs/apel-10.8-r1 >=virtual/emacs-23
-SLOT=0
-SRC_URI=ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/elscreen-1.4.6.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=092911457242e00291bd3dae970ee3bd
diff --git a/app-emacs/elscreen/Manifest b/app-emacs/elscreen/Manifest
new file mode 100644
index 000000000000..94ac8de60f15
--- /dev/null
+++ b/app-emacs/elscreen/Manifest
@@ -0,0 +1,6 @@
+AUX 50elscreen-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX elscreen-1.4.6-emacs-24.patch 5925 BLAKE2B 1c1b7868093a56aadf4e8b2794d767b07de9123dc2be71f4af063d0ab100ca06a187186c3f685024b44b97a69cdab06732dbda3cf1201e5808e5f531d4b4aa07 SHA512 581f5c2c30fa4ae5a8a2266c40842076126a365f947ceaae32299ac680e74a7ca33b077130ff566c12008c79ba4da504160290da72d33ffab5a4d0b40e46557e
+AUX elscreen-1.4.6-void-variable-argi.patch 2789 BLAKE2B 173a2c94528d93660009e0b73e58cedf9343e415f789219350d41fb7b90fc12d7ee7774f6b5b9a97277d54a34e04b4ac4ff93a413018ca0dc872202ad376e6d2 SHA512 254c76e291848caf19983bc896b5a405b9d52dacb871ba5e9009d77968d5249c2445606fb2507f0d0f67859a955aabf4c717dae2acf94f52daa999237fd27333
+DIST elscreen-1.4.6.tar.gz 21680 BLAKE2B a23b7eb617e67205e816cb5c6588f65d8140788ab9c32b90b9c1f53dc4497e6f8250f3c51c38aa40780872f3d878a34aaf2fb455c61640d327df6e3166a59dc7 SHA512 2f19941c9c3e74bbe3912e99f53710f42d33a5b063af99c3907c478d2f571a50a75942519bfcad3bf178585f736bb6e2baf2cdffe8ac66b8e4dbd1b0d881fab2
+EBUILD elscreen-1.4.6-r1.ebuild 905 BLAKE2B 729e11a757c23a3a863c8fcc8c1be4971793326e03abd0c1f914518cadbf5ad041b1ddb9f3c1eb3e8fde4088f880e28779998498417a3ef65ef2152a8cae356e SHA512 9a5f82f0fac66c21e48ed258768bf9ab76c1c01dca4a19227d20e5785e262fbdf3256949fc215e8314d84cfe25f2e02d6c1610c5960d93fab97f315f8c516485
+MISC metadata.xml 1086 BLAKE2B e9254ee3a2f72cd43136c84c0fe5765e91f2fc846bdf94943dc739b5123a936df8b9e6d1210835da5f6dc55db70f7f8858c6a548e684954be63a4cd5c2fa9dd6 SHA512 87bf0cf357b0573f74ef28b6910de612b01f009070277c8ff386e0956913c04683819b8df22a3d4aecbd48f014d2741cd4b852235e3539752465648c754d7f55
diff --git a/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild b/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..c2673da73b4c
--- /dev/null
+++ b/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit elisp
+
+DESCRIPTION="Frame configuration management for GNU Emacs modelled after GNU Screen"
+HOMEPAGE="http://www.morishima.net/~naoto/j/software/elscreen/"
+SRC_URI="ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+IUSE=""
+
+DEPEND=">=app-emacs/apel-10.8-r1"
+RDEPEND="${DEPEND}"
+
+ELISP_PATCHES="${PN}-1.4.6-void-variable-argi.patch ${PN}-1.4.6-emacs-24.patch"
+
+SITEFILE=50${PN}-gentoo.el
+DOCS="ChangeLog README"
+
+pkg_postinst() {
+ elisp-site-regen
+
+ echo
+ elog "ElScreen modifies standard Emacs keybindings and is therefore"
+ elog "no longer loaded from site-gentoo.el. Add the line"
+ elog " (require 'elscreen)"
+ elog "to your ~/.emacs file to enable it on Emacs startup."
+}
diff --git a/app-emacs/elscreen/files/50elscreen-gentoo.el b/app-emacs/elscreen/files/50elscreen-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/elscreen/files/50elscreen-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch b/app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch
new file mode 100644
index 000000000000..dbcb77557f17
--- /dev/null
+++ b/app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch
@@ -0,0 +1,154 @@
+--- elscreen-1.4.6-orig/elscreen.el 2013-05-23 21:31:14.011823000 +1000
++++ elscreen-1.4.6/elscreen.el 2013-10-03 20:55:35.497650931 +1000
+@@ -29,9 +29,9 @@
+ (eval-when-compile
+ (require 'static))
+
+-(static-defconst elscreen-on-xemacs (featurep 'xemacs))
+-(static-defconst elscreen-on-emacs (and (not elscreen-on-xemacs)
+- (>= emacs-major-version 21)))
++(static-defconst elscreen-on-xemacs (featurep 'xemacs)
++ (static-defconst elscreen-on-emacs (and (not elscreen-on-xemacs)
++ (>= emacs-major-version 21))))
+
+
+ ;;; User Customizable Variables:
+@@ -148,7 +148,8 @@
+
+ (static-when elscreen-on-emacs ;; GNU Emacs 21
+ (make-obsolete-variable 'elscreen-tab-display-create-screen
+- 'elscreen-tab-display-control)
++ 'elscreen-tab-display-control
++ "1.4.6")
+ (defcustom elscreen-tab-display-control t
+ "*Non-nil to display control tab at the most left side."
+ :tag "Show/Hide the Control Tab"
+@@ -201,13 +202,13 @@
+ (((class color))
+ (:background "blue" :foreground "black" :underline t)))
+ "Face for tabs other than current screen one."
+- :group 'elscreen))
++ :group 'elscreen)
+
+
+ ;;; Key & Menu bindings:
+
+-(defvar elscreen-map (make-sparse-keymap)
+- "Keymap for ElScreen.")
++ (defvar elscreen-map (make-sparse-keymap)
++ "Keymap for ElScreen."))
+ (define-key elscreen-map "\C-c" 'elscreen-create)
+ (define-key elscreen-map "c" 'elscreen-create)
+ (define-key elscreen-map "C" 'elscreen-clone)
+@@ -899,13 +900,13 @@
+ screen-list-string)
+ (cond
+ ((not (elscreen-screen-live-p screen)) ;; XXX
+- (when (interactive-p)
++ (when (called-interactively-p 'any)
+ (elscreen-message "There is no such screen")))
+ ((null screen-list)
+- (when (interactive-p)
++ (when (called-interactively-p 'any)
+ (elscreen-message "There is only one screen, cannot kill")))
+ ((or
+- (not (interactive-p))
++ (not (called-interactively-p 'any))
+ (yes-or-no-p (format "Really kill screens other than %d? " screen)))
+ (setq screen-list-string (mapconcat
+ (lambda (screen)
+@@ -914,7 +915,7 @@
+ screen-list ","))
+ (elscreen-goto-internal screen)
+ (elscreen-notify-screen-modification 'force-immediately)
+- (when (interactive-p)
++ (when (called-interactively-p 'any)
+ (elscreen-message (format "screen %s killed" screen-list-string)))))
+ screen-list))
+
+@@ -984,7 +985,7 @@
+ (defun elscreen-jump ()
+ "Switch to specified screen."
+ (interactive)
+- (let ((next-screen (string-to-number (string last-command-char))))
++ (let ((next-screen (string-to-number (string last-command-event))))
+ (if (and (<= 0 next-screen) (<= next-screen 9))
+ (elscreen-goto next-screen))))
+ (defalias 'elscreen-jump-0 'elscreen-jump)
+@@ -1046,7 +1047,7 @@
+ (princ (substitute-command-keys
+ (mapconcat 'symbol-value
+ elscreen-help-symbol-list "\n\n")))
+- (print-help-return-message)))
++ (help-print-return-message)))
+
+
+ ;;; Utility Functions
+@@ -1180,7 +1181,7 @@
+ creating one if none already exists."
+ (interactive)
+ (let* ((prompt "Go to the screen with specified buffer: ")
+- (create (or create (interactive-p)))
++ (create (or create (called-interactively-p 'any)))
+ (buffer-name (or (and (bufferp buffer) (buffer-name buffer))
+ (and (stringp buffer) buffer)
+ (and (featurep 'iswitchb)
+@@ -1207,7 +1208,7 @@
+ Use \\[toggle-read-only] to permit editing."
+ (interactive "FFind file read-only in new screen: ")
+ (elscreen-find-file filename)
+- (toggle-read-only 1))
++ (read-only-mode 1))
+
+ (defun elscreen-dired (dirname &optional switches)
+ (interactive (progn
+@@ -1373,27 +1374,28 @@
+ (defvar elscreen-e21-tab-format nil)
+ (make-variable-buffer-local 'elscreen-e21-tab-format)
+
+- (defsubst elscreen-e21-tab-create-keymap (&rest definitions)
+- (let ((keymap (make-sparse-keymap))
+- (key-function-pairs
+- (eval-when-compile
+- (mapcar
+- (lambda (key)
+- (cons key 'ignore))
+- (list 'mouse-1 'mouse-2 'mouse-3
+- 'down-mouse-1 'down-mouse-2 'down-mouse-3
+- 'drag-mouse-1 'drag-mouse-2 'drag-mouse-3)))))
+- (while definitions
+- (set-alist 'key-function-pairs (car definitions) (cadr definitions))
+- (setq definitions (cddr definitions)))
+- (mapc
+- (lambda (key-function-pair)
+- (let ((key (car key-function-pair))
+- (function (cdr key-function-pair)))
+- (define-key keymap (vector 'header-line key) function)))
+- key-function-pairs)
+- keymap))
+-
++ (eval-when-compile
++ (defsubst elscreen-e21-tab-create-keymap (&rest definitions)
++ (let ((keymap (make-sparse-keymap))
++ (key-function-pairs
++ (eval-when-compile
++ (mapcar
++ (lambda (key)
++ (cons key 'ignore))
++ (list 'mouse-1 'mouse-2 'mouse-3
++ 'down-mouse-1 'down-mouse-2 'down-mouse-3
++ 'drag-mouse-1 'drag-mouse-2 'drag-mouse-3)))))
++ (while definitions
++ (set-alist 'key-function-pairs (car definitions) (cadr definitions))
++ (setq definitions (cddr definitions)))
++ (mapc
++ (lambda (key-function-pair)
++ (let ((key (car key-function-pair))
++ (function (cdr key-function-pair)))
++ (define-key keymap (vector 'header-line key) function)))
++ key-function-pairs)
++ keymap)))
++
+ (defsubst elscreen-e21-tab-width ()
+ (if (numberp elscreen-display-tab)
+ elscreen-display-tab
diff --git a/app-emacs/elscreen/files/elscreen-1.4.6-void-variable-argi.patch b/app-emacs/elscreen/files/elscreen-1.4.6-void-variable-argi.patch
new file mode 100644
index 000000000000..b8225070a675
--- /dev/null
+++ b/app-emacs/elscreen/files/elscreen-1.4.6-void-variable-argi.patch
@@ -0,0 +1,71 @@
+--- elscreen.el.orig 2007-12-29 15:12:05.000000000 +0000
++++ elscreen.el
+@@ -1691,6 +1691,10 @@ Use \\[toggle-read-only] to permit editi
+ ("-e" . elscreen-command-line-funcall))))
+
+ (static-when elscreen-on-emacs
++ (cond
++ ; -----------------------
++ ((< emacs-major-version 23) ; emacs22 or prior to
++ (progn
+ (defun elscreen-e21-command-line ()
+ (when (string-match "\\`-" argi)
+ (error "Unknown option `%s'" argi))
+@@ -1703,11 +1707,55 @@ Use \\[toggle-read-only] to permit editi
+ (elscreen-command-line-find-file file file-count line column))
+ (setq line 0)
+ (setq column 0)
+- t)
++ t) ; defun
+
+ (add-hook 'after-init-hook (lambda ()
+ (add-to-list 'command-line-functions
+- 'elscreen-e21-command-line t))))
++ 'elscreen-e21-command-line t)))) ; progn
++ ) ; else
++ ; -----------------------
++ ((= emacs-major-version 23) ; emacs23
++ (progn
++ (defun elscreen-e23-command-line ()
++ (when (string-match "\\`-" argi)
++ (error "Unknown option `%s'" argi))
++ (setq file-count (1+ file-count))
++ (setq inhibit-startup-buffer-menu t)
++ (let* ((file
++ (expand-file-name
++ (command-line-normalize-file-name orig-argi)
++ cl1-dir)))
++ (elscreen-command-line-find-file file file-count cl1-line cl1-column))
++ (setq cl1-line 0)
++ (setq cl1-column 0)
++ t) ; defun
++
++ (add-hook 'after-init-hook (lambda ()
++ (add-to-list 'command-line-functions
++ 'elscreen-e23-command-line t)))) ; progn
++ ) ; else
++ ; -----------------------
++ ((> emacs-major-version 23) ; emacs24 or later
++ (progn
++ (defun elscreen-e24-command-line ()
++ (when (string-match "\\`-" cl1-argi)
++ (error "Unknown option `%s'" cl1-argi))
++ (setq file-count (1+ file-count))
++ (setq inhibit-startup-buffer-menu t)
++ (let* ((file
++ (expand-file-name
++ (command-line-normalize-file-name orig-argi)
++ cl1-dir)))
++ (elscreen-command-line-find-file file file-count cl1-line cl1-column))
++ (setq cl1-line 0)
++ (setq cl1-column 0)
++ t) ; defun
++
++ (add-hook 'after-init-hook (lambda ()
++ (add-to-list 'command-line-functions
++ 'elscreen-e24-command-line t)))) ; progn
++ )
++ )) ; endif (emacs22 or prior to)
+
+ (static-when elscreen-on-xemacs
+ (defadvice command-line-1 (around elscreen-xmas-command-line-1 activate)
diff --git a/app-emacs/elscreen/metadata.xml b/app-emacs/elscreen/metadata.xml
new file mode 100644
index 000000000000..71b064d851b0
--- /dev/null
+++ b/app-emacs/elscreen/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ Emacs is more of an "environment" than just an editor, since it has the
+ strong configuration language, emacs-lisp. There are a lot of applications
+ written in emacs-lisp, and you may run many applications on your Emacs at
+ the same time, i.e. e-mail reader, news reader, IRC client, a kind of IDE,
+ etc. These applications likely consist of two or more windows, so when you
+ switch among applications, you may want to save or restore how windows are
+ located (this is called as "window-configuration"). For this purpose, Emacs
+ has two functions, window-configuratin-to-register and jump-to-register, but
+ these are too primitive to use on a daily basis.
+
+ ElScreen provides the ease-to-use environment to save or restore several
+ window-configurations.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/emacs-common-gentoo-1.6-r1 b/app-emacs/emacs-common-gentoo-1.6-r1
deleted file mode 100644
index 3f72361b7ec2..000000000000
--- a/app-emacs/emacs-common-gentoo-1.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst setup
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Common files needed by all GNU Emacs versions
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-IUSE=games X
-KEYWORDS=alpha amd64 arm ~arm64 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 ~x86-solaris
-LICENSE=GPL-3+
-PDEPEND=virtual/emacs
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-common-gentoo-1.6.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=679a5f9c0096e79f2cfd2977f3fee2c2
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
new file mode 100644
index 000000000000..f20001a8088c
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -0,0 +1,3 @@
+DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
+EBUILD emacs-common-gentoo-1.6-r1.ebuild 2882 BLAKE2B ab454de8e5f8b8c555b60a2129865214337279c9082c3927c455c1bfbac8f4a1de3e2f56a9be3fd7f9a181cd7c9295ebe90a00a64d158991f3f6808a0e14c17c SHA512 f7e4f173fa3c84a7c91e38b6d94b8555483a5c91875a2d87277e4e11423fc162590d45376643ddea08806b4c76a849c09404da421fb693c72e0b6ffa13ee2d9d
+MISC metadata.xml 360 BLAKE2B e7e420afb7a8377bffcf2a23f3954bbf4cc80fcd19a8514733e2e0164f4235271e21dc860bf77cb9cfcd1a4026ef3dafe97a10dc397e2d8e6f001f02bf6e9bc7 SHA512 d57f8f097617229f774b06437aaa83595aab2a6d9321d51b97dac8bd56fa94db396c7bdca538570f0912390e25ae8643c5adc374908757f67f1422fa1f872605
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
new file mode 100644
index 000000000000..ce220414a0cf
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp-common desktop xdg-utils gnome2-utils readme.gentoo-r1 user
+
+DESCRIPTION="Common files needed by all GNU Emacs versions"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+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 ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="games X"
+
+PDEPEND="virtual/emacs"
+
+pkg_setup() {
+ use games && enewgroup gamestat 36
+}
+
+src_install() {
+ insinto "${SITELISP}"
+ doins subdirs.el
+ newins site-gentoo.el{,.orig}
+
+ keepdir /etc/emacs
+ insinto /etc/emacs
+ doins site-start.el
+
+ if use games; then
+ keepdir /var/games/emacs
+ fowners 0:gamestat /var/games/emacs
+ fperms g+w /var/games/emacs
+ fi
+
+ if use X; then
+ local i
+ domenu emacs.desktop emacsclient.desktop || die
+
+ pushd icons || die
+ newicon sink.png emacs-sink.png
+ newicon emacs25_48.png emacs.png
+ for i in 16 24 32 48 128; do
+ [[ ${i} -le 48 ]] && newicon -s ${i} emacs22_${i}.png emacs22.png
+ newicon -s ${i} emacs23_${i}.png emacs23.png
+ newicon -s ${i} emacs25_${i}.png emacs.png
+ done
+ doicon -s scalable emacs23.svg
+ newicon -s scalable emacs25.svg emacs.svg
+ popd
+
+ gnome2_icon_savelist
+ fi
+
+ DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
+ added to ${SITELISP}/site-gentoo.el. In order for this site
+ initialisation to be loaded for all users automatically, a default
+ site startup file /etc/emacs/site-start.el is installed. You are
+ responsible for maintenance of this file.
+ \n\nAlternatively, individual users can add the following command:
+ \n\n(require 'site-gentoo)
+ \n\nto their ~/.emacs initialisation files, or, for greater
+ flexibility, users may load single package-specific initialisation
+ files from the ${SITELISP}/site-gentoo.d/ directory."
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ # make sure that site-gentoo.el exists since site-start.el requires it
+ if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then #554518
+ mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
+ fi
+ if [[ -d ${EROOT}${SITELISP} ]]; then
+ elisp-site-regen
+ cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
+ fi
+
+ if use games; then
+ local f
+ for f in /var/games/emacs/{snake,tetris}-scores; do
+ if [[ -e ${EROOT}${f} ]]; then
+ cp "${EROOT}${f}" "${ED}${f}" || die
+ fi
+ touch "${ED}${f}" || die
+ chgrp gamestat "${ED}${f}" || die
+ chmod g+w "${ED}${f}" || die
+ done
+ fi
+}
+
+pkg_postinst() {
+ if use X; then
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+ readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+ if use X; then
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
diff --git a/app-emacs/emacs-common-gentoo/metadata.xml b/app-emacs/emacs-common-gentoo/metadata.xml
new file mode 100644
index 000000000000..cdc9b75d52a0
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<use>
+ <flag name="games">Support shared score files for games</flag>
+</use>
+</pkgmetadata>
diff --git a/app-emacs/emacs-daemon-0.22 b/app-emacs/emacs-daemon-0.22
deleted file mode 100644
index d8a86c079bd7..000000000000
--- a/app-emacs/emacs-daemon-0.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23 >=virtual/emacs-23
-DESCRIPTION=Gentoo support for Emacs running as a server in the background
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23 >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-daemon-0.22.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=2f82ffa99ce2064372db7516804a488f
diff --git a/app-emacs/emacs-daemon/Manifest b/app-emacs/emacs-daemon/Manifest
new file mode 100644
index 000000000000..3938405ab910
--- /dev/null
+++ b/app-emacs/emacs-daemon/Manifest
@@ -0,0 +1,3 @@
+DIST emacs-daemon-0.22.tar.xz 5276 BLAKE2B a866b14951df94e1d382253dcb7045beb800c9dd754f7eed40eadecde43fd583bb2bc20ad9ccc9f87174b06aadbb26f7875deaf36d9bb5325f98ffa58fded8c7 SHA512 f013cd00d3a24ca348bf718dd20dec7bea89107c0a27c921d6b58595b611991830604fc658d57681708218fbee1dae6dd0b277a2a9da67639e3553e0fd133094
+EBUILD emacs-daemon-0.22.ebuild 1674 BLAKE2B 63e92d60d7c6fd8b146cc83b963f947b1cba0395db3751e66f436187f5592bb8753a4147d25a72522229fdda75bb38ff368e67c41df946da9856d191ef2eea07 SHA512 e7044d8206d47abf8abc2aa8c934b0739ca51250c00d46a3311ec6eb1f05321b5d02e4957d4adcc5f70035f706345529b1ba41ba0d6b177bee5156a5d771fa75
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
new file mode 100644
index 000000000000..e219a750ce93
--- /dev/null
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Gentoo support for Emacs running as a server in the background"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+
+DEPEND=">=virtual/emacs-23"
+RDEPEND="${DEPEND}"
+
+SITEFILE="10${PN}-gentoo.el"
+
+pkg_setup() {
+ local has_daemon has_gtk line
+ has_daemon=$(${EMACS} ${EMACSFLAGS} --eval "(princ (fboundp 'daemonp))")
+ has_gtk=$(${EMACS} ${EMACSFLAGS} --eval "(princ (featurep 'gtk))")
+
+ if [[ ${has_daemon} != t ]]; then
+ while read line; do ewarn "${line}"; done <<-EOF
+ Your current Emacs version does not support running as a daemon which
+ is required for ${CATEGORY}/${PN}.
+ Use "eselect emacs" to select an Emacs version >= 23.
+ EOF
+ elif [[ ${has_gtk} == t ]]; then
+ while read line; do ewarn "${line}"; done <<-EOF
+ Your current Emacs is compiled with GTK+. There is a long-standing bug
+ in GTK+ that prevents Emacs from recovering from X disconnects:
+ <https://bugzilla.gnome.org/show_bug.cgi?id=85715>
+ If you run Emacs as a daemon, then it is strongly recommended that you
+ compile it with the Lucid or the Motif toolkit instead, i.e. with
+ USE="athena Xaw3d -gtk -motif" or USE="motif -gtk -athena -Xaw3d".
+ EOF
+ fi
+}
+
+src_compile() { :; }
+
+src_install() {
+ newinitd emacs.rc emacs
+ newconfd emacs.conf emacs
+ exeinto /usr/libexec/emacs
+ doexe emacs-wrapper.sh emacs-stop.sh
+ elisp-site-file-install "${SITEFILE}"
+ dodoc README ChangeLog
+}
diff --git a/app-emacs/emacs-daemon/metadata.xml b/app-emacs/emacs-daemon/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/emacs-daemon/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/emacs-jabber-0.8.92 b/app-emacs/emacs-jabber-0.8.92
deleted file mode 100644
index a10b601eeab1..000000000000
--- a/app-emacs/emacs-jabber-0.8.92
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/hexrgb sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=A Jabber client for Emacs
-EAPI=5
-HOMEPAGE=http://emacs-jabber.sourceforge.net/ https://www.emacswiki.org/emacs/JabberEl
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-emacs/hexrgb >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://sourceforge/emacs-jabber/emacs-jabber-0.8.92.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=245c6dc4f9563e577abbe8fa01a8d4e9
diff --git a/app-emacs/emacs-jabber/Manifest b/app-emacs/emacs-jabber/Manifest
new file mode 100644
index 000000000000..1c883b22886d
--- /dev/null
+++ b/app-emacs/emacs-jabber/Manifest
@@ -0,0 +1,4 @@
+AUX 50emacs-jabber-gentoo.el 206 BLAKE2B c94ea17b7cab171249f24a873af06ef38b586a25870a27557255902a072b5d0995e14141f7d6a9648d9ba5bbe3e7887a319de67ba2429c9b840b6d2d5b29c8e4 SHA512 44c94b318b547689788c60d41ceb8b93ffbb479099fe94933636a9a91505abaf62bfcbddb145d34cb509d35dec3c0f62b2dafc91477a723ce6585a69f45a9cb5
+DIST emacs-jabber-0.8.92.tar.xz 293948 BLAKE2B 0de6eacb0ae1487a080a241e9ef4c38a98d96647773b7d35857e958e06f35906963947f7de836d2ea80a1935f96ccbc79de83ab88ce307085017ba229679f0f0 SHA512 30cfb5e420914e411bfbbc0c4f1b7fb78190bee6aea61fad0f9b426e0138608f327626da6ff792fc443c58b7d3b70dc3f6291ca4e1a16965fa1283f91afe8882
+EBUILD emacs-jabber-0.8.92.ebuild 519 BLAKE2B f2efe6a49fa5dea71c90eed98cc300ed4631f04408c65ba1e8500aaa72eb469802c23b5af4d0959f62a90b3fa0d3e42e29e87a29e6701bf4019890ee3c316e84 SHA512 6442899fa24a02ecb13aaa69861880d866e29ab9d30919db4b7e096a6456bb681ef243eb21ca621b0add0b6b1f05ff44d394f861b41f7af2c3f4de476b8a8364
+MISC metadata.xml 362 BLAKE2B 3d834f95ef7406fa126c21e84ed39561975cf9c7ee3a66af8304a34b86422f9447fb7668624b9e0ef224f4546995cfd1600a5f8f7a70b2d51cddcf1332645fe6 SHA512 75e5fa9498535b0d4e0aa18d86f598b9017de79d285379c953498b6a7cfc456034f23be6e4abf3d51c78b5bc186c675745d2bb2350da8b9a0b6827dd82657390
diff --git a/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild b/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild
new file mode 100644
index 000000000000..5ca41241e8df
--- /dev/null
+++ b/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A Jabber client for Emacs"
+HOMEPAGE="http://emacs-jabber.sourceforge.net/
+ https://www.emacswiki.org/emacs/JabberEl"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+
+RDEPEND="app-emacs/hexrgb"
+DEPEND="${RDEPEND}
+ sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="jabber.texi"
+DOCS="AUTHORS NEWS README"
diff --git a/app-emacs/emacs-jabber/files/50emacs-jabber-gentoo.el b/app-emacs/emacs-jabber/files/50emacs-jabber-gentoo.el
new file mode 100644
index 000000000000..11d8c5b6f416
--- /dev/null
+++ b/app-emacs/emacs-jabber/files/50emacs-jabber-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'jabber-customize "jabber" "customize jabber options" t)
+(autoload 'jabber-connect "jabber"
+ "connect to the jabber server and start a jabber xml stream" t)
diff --git a/app-emacs/emacs-jabber/metadata.xml b/app-emacs/emacs-jabber/metadata.xml
new file mode 100644
index 000000000000..79c58d32022f
--- /dev/null
+++ b/app-emacs/emacs-jabber/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">emacs-jabber</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/emacs-w3m-1.4.528_pre20140213 b/app-emacs/emacs-w3m-1.4.528_pre20140213
deleted file mode 100644
index f37557db1e8b..000000000000
--- a/app-emacs/emacs-w3m-1.4.528_pre20140213
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/w3m >=virtual/emacs-23 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=emacs-w3m is an interface program of w3m on Emacs
-EAPI=5
-HOMEPAGE=http://emacs-w3m.namazu.org/
-IUSE=l10n_ja
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2+
-RDEPEND=virtual/w3m >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-w3m-1.4.528_pre20140213.tar.xz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=377777d442835d827463cb6c45fbf818
diff --git a/app-emacs/emacs-w3m-1.4.570_pre20170203 b/app-emacs/emacs-w3m-1.4.570_pre20170203
deleted file mode 100644
index 74833f551c04..000000000000
--- a/app-emacs/emacs-w3m-1.4.570_pre20170203
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/w3m >=virtual/emacs-23 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=emacs-w3m is an interface program of w3m on Emacs
-EAPI=6
-HOMEPAGE=http://emacs-w3m.namazu.org/
-IUSE=l10n_ja
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2+
-RDEPEND=virtual/w3m >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-w3m-1.4.570_pre20170203.tar.xz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=75b43078b19c6756e51110852963886d
diff --git a/app-emacs/emacs-w3m-1.4.625_pre20180518 b/app-emacs/emacs-w3m-1.4.625_pre20180518
deleted file mode 100644
index 3e2188f43607..000000000000
--- a/app-emacs/emacs-w3m-1.4.625_pre20180518
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/w3m >=virtual/emacs-23 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=emacs-w3m is an interface program of w3m on Emacs
-EAPI=6
-HOMEPAGE=http://emacs-w3m.namazu.org/
-IUSE=l10n_ja
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2+
-RDEPEND=virtual/w3m >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-w3m-1.4.625_pre20180518.tar.xz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=75b43078b19c6756e51110852963886d
diff --git a/app-emacs/emacs-w3m/Manifest b/app-emacs/emacs-w3m/Manifest
new file mode 100644
index 000000000000..f719febf72c1
--- /dev/null
+++ b/app-emacs/emacs-w3m/Manifest
@@ -0,0 +1,8 @@
+AUX 70emacs-w3m-gentoo.el 96 BLAKE2B 90d452df120d37b1d19be08ed6e7b56edb588c95de6d124bdb8d25daa5c65fd8a19500e29e94a0936aa8efa2b51bae258e1431c6d1459d0d700e8d1dae0cbaca SHA512 7fd090a575e5b8f2df50bd751f301f5f4409dfd78eb45bb911c54a3cbfe76941a146630ea0e4089138c400caf45bb040f72e3ac335457061776e01e0aa3f5577
+DIST emacs-w3m-1.4.528_pre20140213.tar.xz 751532 BLAKE2B 14527b80ed3938f2685a98cf37633a9ba046b070d94dffd7c8082d65c09dfca4a63114aff55d0bfe85853d8623db55dd63db3e7d10142871287312281fa4ef59 SHA512 f4ccb41f2011354c091c9b07b2ab596f030a6b2e8ef2ef674db75c93e5bfe7347b8b3602283e169e7fd591c44b222482d1a399880c60176fc55a5e77ed728483
+DIST emacs-w3m-1.4.570_pre20170203.tar.xz 765108 BLAKE2B 75568e543719a25863ee943293f1a6ca4fff8b5af19a39d910efe5a8bfa7f311ef3620c34a6fcfe23e231e33d61c9ba5a03cf39b23155982079a0cf28471a341 SHA512 d1940679055d7ad74b7c417dc9e56061524f5afdf758075139e279c2df325af10eae334a6b83d40d39857237396da04744f19c293ffb8adb2e579c32ed118b52
+DIST emacs-w3m-1.4.625_pre20180518.tar.xz 788404 BLAKE2B f621071c8657cab848789d359d492e5bee0fe401af48871fa54298571d87192de7186b1ea92fd3d64e6f1713fd12e5750b49b7e54c94e8d3b455d614ef0d0683 SHA512 f60317024f6dca23699510c21f185c162a5b3f0be551c681ce69b3b46e6fc7860e875fa6fc46a0bfafd8e5e6aaa9f1b29af0e0731685fbca2ce2b636eca7ad93
+EBUILD emacs-w3m-1.4.528_pre20140213.ebuild 1120 BLAKE2B e136c6089f6e29092c17f09ff36199e081eb6cc28c7ef276ce6781aaf02e503271988664192628db8a7c8532c9f9c6bb09b67f488cae444166f097c2025d63b3 SHA512 270d48daafef67a4da1fe7d7a3f362c27732a59396bc4b845ba6d1be7f0e8865954b478042404efcdebf2ef0a2cfa390f3a13fe9906255f9bb2b2ea0954b2b8f
+EBUILD emacs-w3m-1.4.570_pre20170203.ebuild 1215 BLAKE2B 98cc7be2a22dab4a69444df06d37ece302e3b8211e80060c27a9ba0c425af7af5b53f9ce224bb3d3cd13be8995ec4f16ccf3717b50efac71199bbc8e55f7e8bf SHA512 9ec23005c602a2879d7ca26c7f44d67efa9663ee8d9d7c346aefd2b374166608bb6cef7d1d23d43c2ee295fc5420681ff63f74a6b8d0b007a83d9cc2c26cb3de
+EBUILD emacs-w3m-1.4.625_pre20180518.ebuild 1215 BLAKE2B 98cc7be2a22dab4a69444df06d37ece302e3b8211e80060c27a9ba0c425af7af5b53f9ce224bb3d3cd13be8995ec4f16ccf3717b50efac71199bbc8e55f7e8bf SHA512 9ec23005c602a2879d7ca26c7f44d67efa9663ee8d9d7c346aefd2b374166608bb6cef7d1d23d43c2ee295fc5420681ff63f74a6b8d0b007a83d9cc2c26cb3de
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.528_pre20140213.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.528_pre20140213.ebuild
new file mode 100644
index 000000000000..7f9097a4aa50
--- /dev/null
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.528_pre20140213.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp autotools
+
+DESCRIPTION="emacs-w3m is an interface program of w3m on Emacs"
+HOMEPAGE="http://emacs-w3m.namazu.org/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="l10n_ja"
+
+DEPEND="virtual/w3m"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+SITEFILE="70${PN}-gentoo.el"
+
+src_prepare() {
+ eautoreconf
+}
+
+src_configure() {
+ default
+}
+
+src_compile() {
+ emake all-en $(use l10n_ja && echo all-ja)
+}
+
+src_install() {
+ emake lispdir="${ED}${SITELISP}/${PN}" \
+ infodir="${ED}/usr/share/info" \
+ ICONDIR="${ED}${SITEETC}/${PN}" \
+ install-en $(use l10n_ja && echo install-ja) install-icons
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ dodoc ChangeLog* NEWS README
+ use l10n_ja && dodoc BUGS.ja NEWS.ja README.ja
+
+ DOC_CONTENTS="If you want to use the shimbun library, please emerge
+ app-emacs/apel and app-emacs/flim."
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.570_pre20170203.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.570_pre20170203.ebuild
new file mode 100644
index 000000000000..cfd2bfcc7f22
--- /dev/null
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.570_pre20170203.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp autotools readme.gentoo-r1
+
+DESCRIPTION="emacs-w3m is an interface program of w3m on Emacs"
+HOMEPAGE="http://emacs-w3m.namazu.org/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="l10n_ja"
+
+DEPEND="virtual/w3m"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+SITEFILE="70${PN}-gentoo.el"
+
+src_prepare() {
+ mv configure.{in,ac} || die
+ sed -i -e '/^configure:/,+2d' Makefile.in || die
+ eapply_user
+ eautoreconf
+}
+
+src_configure() {
+ default
+}
+
+src_compile() {
+ emake all-en $(use l10n_ja && echo all-ja)
+}
+
+src_install() {
+ emake lispdir="${ED}${SITELISP}/${PN}" \
+ infodir="${ED}/usr/share/info" \
+ ICONDIR="${ED}${SITEETC}/${PN}" \
+ install-en $(use l10n_ja && echo install-ja) install-icons
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ dodoc ChangeLog* NEWS README
+ use l10n_ja && dodoc BUGS.ja NEWS.ja README.ja
+
+ DOC_CONTENTS="If you want to use the shimbun library, please emerge
+ app-emacs/apel and app-emacs/flim."
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild
new file mode 100644
index 000000000000..cfd2bfcc7f22
--- /dev/null
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp autotools readme.gentoo-r1
+
+DESCRIPTION="emacs-w3m is an interface program of w3m on Emacs"
+HOMEPAGE="http://emacs-w3m.namazu.org/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="l10n_ja"
+
+DEPEND="virtual/w3m"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+SITEFILE="70${PN}-gentoo.el"
+
+src_prepare() {
+ mv configure.{in,ac} || die
+ sed -i -e '/^configure:/,+2d' Makefile.in || die
+ eapply_user
+ eautoreconf
+}
+
+src_configure() {
+ default
+}
+
+src_compile() {
+ emake all-en $(use l10n_ja && echo all-ja)
+}
+
+src_install() {
+ emake lispdir="${ED}${SITELISP}/${PN}" \
+ infodir="${ED}/usr/share/info" \
+ ICONDIR="${ED}${SITEETC}/${PN}" \
+ install-en $(use l10n_ja && echo install-ja) install-icons
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ dodoc ChangeLog* NEWS README
+ use l10n_ja && dodoc BUGS.ja NEWS.ja README.ja
+
+ DOC_CONTENTS="If you want to use the shimbun library, please emerge
+ app-emacs/apel and app-emacs/flim."
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/emacs-w3m/files/70emacs-w3m-gentoo.el b/app-emacs/emacs-w3m/files/70emacs-w3m-gentoo.el
new file mode 100644
index 000000000000..2f97e134da2d
--- /dev/null
+++ b/app-emacs/emacs-w3m/files/70emacs-w3m-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(setq w3m-icon-directory "@SITEETC@")
+(require 'w3m-load)
diff --git a/app-emacs/emacs-w3m/metadata.xml b/app-emacs/emacs-w3m/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/emacs-w3m/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/emacs-wget-0.5.0-r1 b/app-emacs/emacs-wget-0.5.0-r1
deleted file mode 100644
index 01f873a4cb6d..000000000000
--- a/app-emacs/emacs-wget-0.5.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Wget interface for Emacs
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/EmacsWget
-IUSE=l10n_ja
-KEYWORDS=alpha amd64 ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=net-misc/wget-1.8.2 >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/emacs-wget-0.5.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=9356f8b157e11f8cc9b83453dd5611f0
diff --git a/app-emacs/emacs-wget/Manifest b/app-emacs/emacs-wget/Manifest
new file mode 100644
index 000000000000..6e3906e7daf5
--- /dev/null
+++ b/app-emacs/emacs-wget/Manifest
@@ -0,0 +1,4 @@
+AUX 50emacs-wget-gentoo.el 230 BLAKE2B bca8ec11b147a2017a663304ca68b9796c6f9049f5ee7ff7ed674f271805188b8c698c7165c7e9e17c7d9f750346fa9a056d9830e1303887ac35e141b4adc8a0 SHA512 803bf76202edd3d130a8050a026ddf84a4a2dbe65f6bf5fc159a66b3af12e2d46ce519a61296fcada0ad0ed3fbf61d62bcc87e3329dde02a83d09f94ff257d01
+DIST emacs-wget-0.5.0.tar.gz 37074 BLAKE2B d2922c0396dfc745335ee5adc7bad1ecc440ada6e43ac1be00939c592fca5a5de0ea0e4a69a4186efe7a23cbdabcae17fa146a146743add1c615eead3a42a75e SHA512 32d322cda7435b901115cdc01ef6b6e84f2af7f686f7d6a89cc486523d9d8b9807903c4ee0fb945a4ff457720033523beb34037e29ef7c9cdf2a10c62b725d54
+EBUILD emacs-wget-0.5.0-r1.ebuild 571 BLAKE2B 524df075eae96cbeffc0ce0a4f8dd953f7b5c50cb2f0e2d89a139edb3e50af41718c2f64617c6ac189e339cfd8ec4f3b3dee455975613a13fbabb662e946ccc9 SHA512 fa282f710316223ccec69d3d233d56e2b6fcec033b081fe16d33d8a8f71456509c18eb64c9790bb5fa452a75cd61f7130f64a8008188f87b1ee2bd07ed0a16b3
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/emacs-wget/emacs-wget-0.5.0-r1.ebuild b/app-emacs/emacs-wget/emacs-wget-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..348adb4562c7
--- /dev/null
+++ b/app-emacs/emacs-wget/emacs-wget-0.5.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Wget interface for Emacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/EmacsWget"
+SRC_URI="http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
+IUSE="l10n_ja"
+
+RDEPEND=">=net-misc/wget-1.8.2"
+
+ELISP_REMOVE="lpath.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+ elisp_src_install
+ dodoc ChangeLog README USAGE
+ use l10n_ja && dodoc README.ja USAGE.ja
+}
diff --git a/app-emacs/emacs-wget/files/50emacs-wget-gentoo.el b/app-emacs/emacs-wget/files/50emacs-wget-gentoo.el
new file mode 100644
index 000000000000..51afcaf6d4c1
--- /dev/null
+++ b/app-emacs/emacs-wget/files/50emacs-wget-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'wget "wget" "wget interface for Emacs." t)
+(autoload 'wget-web-page "wget" "wget interface to download whole web page." t)
+(add-hook 'w3m-mode-hook (lambda () (require 'w3m-wget)))
diff --git a/app-emacs/emacs-wget/metadata.xml b/app-emacs/emacs-wget/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/emacs-wget/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/emhacks-20070920-r1 b/app-emacs/emhacks-20070920-r1
deleted file mode 100644
index a895934bfbd9..000000000000
--- a/app-emacs/emhacks-20070920-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Useful Emacs Lisp libraries, including gdiff, jjar, jmaker, swbuff, and tabbar
-EAPI=6
-HOMEPAGE=http://emhacks.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emhacks-20070920.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=2865aeb84bbd72d2a7ca214d2e7fd99c
diff --git a/app-emacs/emhacks/Manifest b/app-emacs/emhacks/Manifest
new file mode 100644
index 000000000000..92771445a9b1
--- /dev/null
+++ b/app-emacs/emhacks/Manifest
@@ -0,0 +1,4 @@
+AUX 50emhacks-gentoo.el 785 BLAKE2B 90811c7d1acdc25a1a2a430af1ce8a8bfe9845042f22b6043208dda87a1ffad5946f2ccf04036bb9b1aa433de6f03d09de911b5ce5e1b29d2ec773bc76b96825 SHA512 80961af6c9ba24ab964214e68d464ac88b2c88894b069b90f7041dbbade02c96b3cb2c60876f90134882a4984386a73ff23ebc785c19cd18a11e6b424c2a62ff
+DIST emhacks-20070920.tar.bz2 71232 BLAKE2B 82c80bc41daa37868fe6376461df9cc96ee6d5db1b5e4a2e6414b9cd114fe57f3f5a226e82d2b9e5ac7e42a84faea585fa18621da5c7db4181334fb8db73cc9e SHA512 097a4602d82587a20feeb14c4717c69536336319f43f7b5e8b4ba0c7f878218138eddbe1edb6293222b7c5798b94dd2c8393231a7b8fb8f32fe5349f2b054bb1
+EBUILD emhacks-20070920-r1.ebuild 636 BLAKE2B fe44df7b58e6bd82f832cd4764cb0853b73c2cd81c9d17b659535e1d6c7c77f0e3d81e4decacbe0409b5ca23c52ab9a662efa9b5265a9cffbe1da0bb9c6acf70 SHA512 ac9d715f9671d97799d7baebd5553d4014cdeebb46039eae19263a13c8786ec763b6348a8d79f88b5db0dbbc79316dc539c4ce15e30b073ac656da6e4b7682da
+MISC metadata.xml 760 BLAKE2B cfd74bf2e45dae8d7149c37e7ff876858b976a76bcf26eedabd6894f5373d329892a35344b627cb6987e147ff9f2eb908159d7d5a81eb7c79fe58f103ecc894e SHA512 093c9e13fcd1176feb37eb7a0453f4b20bae934bf9ae21d2919ea2f73c676691d0fc590c165082e718ed05902c698873c2579679cf2bd3eab37918d0eb39778f
diff --git a/app-emacs/emhacks/emhacks-20070920-r1.ebuild b/app-emacs/emhacks/emhacks-20070920-r1.ebuild
new file mode 100644
index 000000000000..3fdd0d1d1b1c
--- /dev/null
+++ b/app-emacs/emhacks/emhacks-20070920-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Useful Emacs Lisp libraries, including gdiff, jjar, jmaker, swbuff, and tabbar"
+HOMEPAGE="http://emhacks.sourceforge.net/"
+# CVS snapshot
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="Changelog"
+
+src_prepare() {
+ # remove files included in Emacs>=22 or not useful on GNU/Linux
+ # remove jsee #642588
+ rm -r findstr* jsee* overlay-fix* recentf* ruler-mode* tree-widget* || die
+ eapply_user
+}
diff --git a/app-emacs/emhacks/files/50emhacks-gentoo.el b/app-emacs/emhacks/files/50emhacks-gentoo.el
new file mode 100644
index 000000000000..1488d88313cb
--- /dev/null
+++ b/app-emacs/emhacks/files/50emhacks-gentoo.el
@@ -0,0 +1,28 @@
+(add-to-list 'load-path "@SITELISP@")
+
+;; dir-tree
+(autoload 'dir-tree "dir-tree"
+ "Display the ROOT directory in a tree widget." t)
+
+;; gdiff
+(require 'gdiff-setup)
+
+;; swbuff
+(autoload 'swbuff-switch-to-next-buffer "swbuff"
+ "Switch to the next buffer in the buffer list." t)
+(autoload 'swbuff-kill-this-buffer "swbuff"
+ "Kill the current buffer.
+And update the status window if showing." t)
+
+;; tabbar
+(autoload 'tabbar-local-mode "tabbar" nil t)
+(autoload 'tabbar-mode "tabbar" nil t)
+(autoload 'tabbar-mwheel-mode "tabbar" nil t)
+
+;; jjar
+(autoload 'jjar-create "jjar" "Create a new jar file." t)
+(autoload 'jjar-update "jjar" "Update an existing jar file." t)
+
+;; jmaker
+(autoload 'jmaker-generate-makefile "jmaker"
+ "Generate and edit a Java Makefile in directory ROOT." t)
diff --git a/app-emacs/emhacks/metadata.xml b/app-emacs/emhacks/metadata.xml
new file mode 100644
index 000000000000..1f870117fe1c
--- /dev/null
+++ b/app-emacs/emhacks/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ The EMHACKS project goal is to provide a set of useful libraries to help
+ using Emacs or XEmacs.
+
+ Among those libraries you will find:
+ gdiff, Use an external GUI diff tool from [X]Emacs;
+ jjar, Java Archive builder;
+ jmaker, Java Makefile generator;
+ swbuff, Quick switch between Emacs buffers;
+ tabbar, Display a tab bar in the header line.
+</longdescription>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">emhacks</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/emms-3.0-r1 b/app-emacs/emms-3.0-r1
deleted file mode 100644
index 74128952969d..000000000000
--- a/app-emacs/emms-3.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=media-libs/taglib >=virtual/emacs-23
-DESCRIPTION=The Emacs Multimedia System
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/emms/ https://www.emacswiki.org/emacs/EMMS
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-3+ FDL-1.1+
-RDEPEND=media-libs/taglib >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://www.gnu.org/software/emms/download/emms-3.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=0ebaba582add43d378c974bc1e74d2d4
diff --git a/app-emacs/emms-4.1 b/app-emacs/emms-4.1
deleted file mode 100644
index e61e331655fb..000000000000
--- a/app-emacs/emms-4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=media-libs/taglib >=virtual/emacs-23
-DESCRIPTION=The Emacs Multimedia System
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/emms/ https://www.emacswiki.org/emacs/EMMS
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-3+ FDL-1.1+
-RDEPEND=media-libs/taglib >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gnu/emms/emms-4.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e609db7ea9023fbbaa8be7a10968a5b6
diff --git a/app-emacs/emms-4.3 b/app-emacs/emms-4.3
deleted file mode 100644
index 841e2e4d9ba1..000000000000
--- a/app-emacs/emms-4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=media-libs/taglib >=virtual/emacs-23
-DESCRIPTION=The Emacs Multimedia System
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/emms/ https://www.emacswiki.org/emacs/EMMS
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-3+ FDL-1.1+
-RDEPEND=media-libs/taglib >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gnu/emms/emms-4.3.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=54092665f9aa757d6ebcc23c74c88c5d
diff --git a/app-emacs/emms-4.4 b/app-emacs/emms-4.4
deleted file mode 100644
index e03cdd31d7e2..000000000000
--- a/app-emacs/emms-4.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=media-libs/taglib >=virtual/emacs-23
-DESCRIPTION=The Emacs Multimedia System
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/emms/ https://www.emacswiki.org/emacs/EMMS
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-3+ FDL-1.1+
-RDEPEND=media-libs/taglib >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gnu/emms/emms-4.4.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=54092665f9aa757d6ebcc23c74c88c5d
diff --git a/app-emacs/emms/Manifest b/app-emacs/emms/Manifest
new file mode 100644
index 000000000000..fd5fdf855770
--- /dev/null
+++ b/app-emacs/emms/Manifest
@@ -0,0 +1,12 @@
+AUX 50emms-gentoo.el 59 BLAKE2B 30539342b0dff0c6508585863470f73fcb2ea8da86819ba144422a775982425965e75617b6e2a83b582c4f00d1d9737b1b6d024d6ec654a014af9748e940a4d3 SHA512 e1dcdf700ec405915ecc67dbca29b89468ab16b413cfa9ae5910481036db4627609939a7142d1d58f4f66464f12af02722750e24b25513a265be66c0943f7c66
+AUX emms-3.0-Makefile.patch 411 BLAKE2B 3dfed92dd7ea4b5ffeb63821006913c429b9ce96ba39aa4eb2bcf372e677cbfff75025e20d27556bbcf850bb5027c7494118f4179086ccbb6dc23fdf40193ca8 SHA512 6e659103419d6d9ed5129cc48b670d0bb54389dc339258addb39b7590043a95c80af401a4eed55e96a2872145cc16e7654f6b263112db97be3f158c13c9bbd81
+AUX emms-3.0-texinfo-5.patch 509 BLAKE2B 500aaf52d1ee8b4f1dcca021f5c4ab5d097effa6be68318b7adf6e69a3efcf4bb3919a9bc1333dfac5d54daf2c91f9926542211d104314688f5e09d4dc0c30a4 SHA512 bce004eff25f371507b38b7176873c0d54fe28e873431a4ff4a714523912dcc07a7284a2527c9751f77ab0260ee4ca76e63557df4dc02fe8eb06537d5b750178
+DIST emms-3.0.tar.gz 200838 BLAKE2B bca2f720abfa79d8ba460115169660ef1c52be895d9f49638cb771e2824456f59a4bbb8e92c4dafe3eb11203099ec564e4033e4fcaf305d26f39047423efde93 SHA512 a6637d6d9bcf7fdc81815e698b51579d2dcb51b70b39d65117a81d180541f4774c82a1da23f5e67a5ffd37d5f1a4ce4fe5f653f8e443f899910320eaf5420119
+DIST emms-4.1.tar.gz 283625 BLAKE2B 4ec32ca724f414024ef26db1f93f573f36605b32530ace833d2f3b1a7230f2da374c0cd3307082d44372c201ac6fd8b8eec9da0938db1699437b93236bda5cbe SHA512 b92773bb102e8d082a70644743665d5a1bfa470f579b8aaa1df60a29d0156aa6c4d516ea92a842db50d3418d63be7eb0cd36f18e9e3574b840056ed4ea210107
+DIST emms-4.3.tar.gz 287153 BLAKE2B 2b8dab4f18ea7a6eb4e0b982d795d5f16dcdbe39dc091e6f6fe056cf1143b11620ef8ee4fc83612224c6674978747b8c96575e797f0779b6fab71f46f921f918 SHA512 fd674e8637700d0a08cbdf0253ffd285623ba8181fac389eb94a701091ce25b071f995baa4fd68d60528dbbb90bbf034705bf52b41d9d5edd7af12c2c99418ed
+DIST emms-4.4.tar.gz 288922 BLAKE2B d86cd9124f1d92d9d91aa96c45f7fd5e86776ff5f15cfa5e139eb40bc72e673f394b3d5209e64da62d3ab02ef18d6ac690e1d4e4273f3aad9c53b7e5ac4e7839 SHA512 d0aaac80728b542366885916e43c2c50302a5a5d6c9e35ff53a5b46a7185fda19459ea28f0d77929920873d7d9732fa531a4ef50f5052ed4df42cc474d14d0ba
+EBUILD emms-3.0-r1.ebuild 1016 BLAKE2B 07a8af942d47ab48e633979f35a7c6375d0db9a06a5c497bcaf7a1a9b9603ab678f8c92b39455e7f8c175ce7044910d12d7d2ca2fce5cd93a9b71392c6cf0a8b SHA512 8e8e8705b576c990ed90e71ad16f458b74876ce6796b337b326fb0e2d99af681b02fd795df4a49b8282b91ddd64359b195b669977169b4ba57f8bf2c1a1bb4f8
+EBUILD emms-4.1.ebuild 950 BLAKE2B 487f4e0dc9e6691f03e5253cf73eba3b0b450e0b03f6eb229a71959033cd2706de53318613d3bfda38721ea808f038b27f08d8841eeec4c99d269a44d6cee862 SHA512 1fce44cd0519199ea6f70ee847906aedf527a23f537a0a4f8a55ba2a2db198c955b6fa226cfa35d312f548a1fff4c1fb20cd51aa3e02a51ffec98d45bc8c845e
+EBUILD emms-4.3.ebuild 969 BLAKE2B dac5a1c76e731a2f59f0f2ebe60f9b4fb3d3ee0ec758833493beaa3f3e93708e60c8cb5ea5662c97fa3c323ae22d3f74762a82c9df3abd9c7d5bc978f216cbd8 SHA512 615ada145b969798344b3d620d5a6248535664230256f524f2be3e7eecb9585974c033d83ba4963b4c8b57bf0e0c180a8713582a6588f27b99d57622d912b83a
+EBUILD emms-4.4.ebuild 969 BLAKE2B dac5a1c76e731a2f59f0f2ebe60f9b4fb3d3ee0ec758833493beaa3f3e93708e60c8cb5ea5662c97fa3c323ae22d3f74762a82c9df3abd9c7d5bc978f216cbd8 SHA512 615ada145b969798344b3d620d5a6248535664230256f524f2be3e7eecb9585974c033d83ba4963b4c8b57bf0e0c180a8713582a6588f27b99d57622d912b83a
+MISC metadata.xml 781 BLAKE2B 739489caf65d955e61f99ab70f53c236146dc6b06d36f60896fdcfa448165c1e39bc7bdf4cd7c4566b6f471852aa1b215a2f346b4b8783204501610cce031180 SHA512 5208cf25762a76d125453737c53d318ffa79e132eb0aff994161e8e0fe7594360789a21128d854b675f46766a97b6e1a9db99fe9ff98ffbadd137d481e14692a
diff --git a/app-emacs/emms/emms-3.0-r1.ebuild b/app-emacs/emms/emms-3.0-r1.ebuild
new file mode 100644
index 000000000000..0b9f95372740
--- /dev/null
+++ b/app-emacs/emms/emms-3.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp toolchain-funcs
+
+DESCRIPTION="The Emacs Multimedia System"
+HOMEPAGE="https://www.gnu.org/software/emms/
+ https://www.emacswiki.org/emacs/EMMS"
+SRC_URI="https://www.gnu.org/software/emms/download/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-libs/taglib"
+RDEPEND="${DEPEND}"
+
+# EMMS can use almost anything for playing media files therefore the dependency
+# possibilities are so broad that we refrain from setting anything explicitly
+# in DEPEND/RDEPEND.
+
+ELISP_PATCHES="${P}-Makefile.patch
+ ${P}-texinfo-5.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ emake CC="$(tc-getCC)" \
+ EMACS=emacs \
+ all emms-print-metadata
+}
+
+src_install() {
+ elisp-install ${PN} *.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ doinfo *.info*
+ dobin *-wrapper emms-print-metadata
+ dodoc AUTHORS ChangeLog FAQ NEWS README RELEASE
+}
diff --git a/app-emacs/emms/emms-4.1.ebuild b/app-emacs/emms/emms-4.1.ebuild
new file mode 100644
index 000000000000..44a65e00eee5
--- /dev/null
+++ b/app-emacs/emms/emms-4.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp toolchain-funcs
+
+DESCRIPTION="The Emacs Multimedia System"
+HOMEPAGE="https://www.gnu.org/software/emms/
+ https://www.emacswiki.org/emacs/EMMS"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-libs/taglib"
+RDEPEND="${DEPEND}"
+
+# EMMS can use almost anything for playing media files therefore the dependency
+# possibilities are so broad that we refrain from setting anything explicitly
+# in DEPEND/RDEPEND.
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ emake CC="$(tc-getCC)" \
+ all emms-print-metadata
+}
+
+src_install() {
+ elisp-install ${PN} lisp/*.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ doinfo doc/emms.info*
+ dobin src/emms-print-metadata
+ doman emms-print-metadata.1
+ dodoc AUTHORS ChangeLog NEWS README THANKGNU
+}
diff --git a/app-emacs/emms/emms-4.3.ebuild b/app-emacs/emms/emms-4.3.ebuild
new file mode 100644
index 000000000000..1aacf114f268
--- /dev/null
+++ b/app-emacs/emms/emms-4.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp toolchain-funcs
+
+DESCRIPTION="The Emacs Multimedia System"
+HOMEPAGE="https://www.gnu.org/software/emms/
+ https://www.emacswiki.org/emacs/EMMS"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-libs/taglib"
+RDEPEND="${DEPEND}"
+
+# EMMS can use almost anything for playing media files therefore the dependency
+# possibilities are so broad that we refrain from setting anything explicitly
+# in DEPEND/RDEPEND.
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+ all emms-print-metadata
+}
+
+src_install() {
+ elisp-install ${PN} lisp/*.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ doinfo doc/emms.info*
+ dobin src/emms-print-metadata
+ doman emms-print-metadata.1
+ dodoc AUTHORS ChangeLog NEWS README THANKGNU
+}
diff --git a/app-emacs/emms/emms-4.4.ebuild b/app-emacs/emms/emms-4.4.ebuild
new file mode 100644
index 000000000000..1aacf114f268
--- /dev/null
+++ b/app-emacs/emms/emms-4.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp toolchain-funcs
+
+DESCRIPTION="The Emacs Multimedia System"
+HOMEPAGE="https://www.gnu.org/software/emms/
+ https://www.emacswiki.org/emacs/EMMS"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-libs/taglib"
+RDEPEND="${DEPEND}"
+
+# EMMS can use almost anything for playing media files therefore the dependency
+# possibilities are so broad that we refrain from setting anything explicitly
+# in DEPEND/RDEPEND.
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+ all emms-print-metadata
+}
+
+src_install() {
+ elisp-install ${PN} lisp/*.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ doinfo doc/emms.info*
+ dobin src/emms-print-metadata
+ doman emms-print-metadata.1
+ dodoc AUTHORS ChangeLog NEWS README THANKGNU
+}
diff --git a/app-emacs/emms/files/50emms-gentoo.el b/app-emacs/emms/files/50emms-gentoo.el
new file mode 100644
index 000000000000..9749f5e1e866
--- /dev/null
+++ b/app-emacs/emms/files/50emms-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'emms-auto)
diff --git a/app-emacs/emms/files/emms-3.0-Makefile.patch b/app-emacs/emms/files/emms-3.0-Makefile.patch
new file mode 100644
index 000000000000..4f5760c162b3
--- /dev/null
+++ b/app-emacs/emms/files/emms-3.0-Makefile.patch
@@ -0,0 +1,11 @@
+--- emms-3.0-orig/Makefile 2007-06-29 18:16:24.000000000 +0200
++++ emms-3.0/Makefile 2010-08-09 22:14:39.000000000 +0200
+@@ -41,7 +41,7 @@
+ makeinfo --html --no-split $<
+
+ emms-print-metadata: emms-print-metadata.c
+- $(CC) -o $@ $< -I/usr/include/taglib -L/usr/lib -ltag_c
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< `taglib-config --libs --cflags` -ltag_c
+
+ install:
+ test -d $(SITELISP) || mkdir -p $(SITELISP)
diff --git a/app-emacs/emms/files/emms-3.0-texinfo-5.patch b/app-emacs/emms/files/emms-3.0-texinfo-5.patch
new file mode 100644
index 000000000000..10ee2ad57524
--- /dev/null
+++ b/app-emacs/emms/files/emms-3.0-texinfo-5.patch
@@ -0,0 +1,17 @@
+--- emms-3.0-orig/gpl.texi
++++ emms-3.0/gpl.texi
+@@ -659,6 +659,8 @@
+ Program, unless a warranty or assumption of liability accompanies a
+ copy of the Program in return for a fee.
+
++@end enumerate
++
+ @iftex
+ @heading END OF TERMS AND CONDITIONS
+ @end iftex
+@@ -721,5 +723,3 @@
+ applications with the library. If this is what you want to do, use
+ the GNU Lesser General Public License instead of this License. But
+ first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
+-
+-@end enumerate
diff --git a/app-emacs/emms/metadata.xml b/app-emacs/emms/metadata.xml
new file mode 100644
index 000000000000..f03f5834c354
--- /dev/null
+++ b/app-emacs/emms/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ EMMS, the Emacs Multimedia System, is an extensible, light-weight
+ multimedia player system for Emacs. It includes support for audio
+ and video formats such as MP3, FLAC, Ogg Vorbis, MPEG, WMV, MOV,
+ AVI, OGM, MKV via external players such as MPlayer, GStreamer,
+ mpg321, ogg123 etc.
+
+ EMMS also includes meta data tagging capabilities (including batched
+ tagging), play-list management, play-list scoring, streamed media
+ and support for synchronized song lyrics display.
+</longdescription>
+</pkgmetadata>
diff --git a/app-emacs/erobot-2.1.0-r1 b/app-emacs/erobot-2.1.0-r1
deleted file mode 100644
index 629aa4751ee3..000000000000
--- a/app-emacs/erobot-2.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Battle-bots for Emacs!
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/EmacsRobots
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/erobot-2.1.0.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=bd274dd6ad0e51c0cb0e24f9bc36b80c
diff --git a/app-emacs/erobot/Manifest b/app-emacs/erobot/Manifest
new file mode 100644
index 000000000000..b64445a6cc40
--- /dev/null
+++ b/app-emacs/erobot/Manifest
@@ -0,0 +1,5 @@
+AUX 50erobot-gentoo.el 195 BLAKE2B 126c2a886e010a18541b17222bf6fe03719fe280bedc50eb4cdd9991a7a212671122ec8dfcaf8b9db0e548d0c247dc983b404460da7be59781b41154353f17f4 SHA512 451baf6369149ad36ab35defec43da2cc095688776fe24f3c786fd107b8e5fdc02e7aadb52f3905f9350e273d3c1e08512ae42feaad9fa0650fe31483d4f3f0d
+AUX erobot-2.1.0-fix-interactive.patch 520 BLAKE2B 9d1120fc449b24bd8607c348abe0dc648dbf83ded0ebaaf7dc56fb8b796f2b029bdf42e3bd0162647e50cf7e9bbefbab532a4a2e8701ad5bb5c9a71c4dac3231 SHA512 c71434f7a44e65657ba8fdfb32b0b377773fed3850e2c3ef6f5e6c00fedb059748fa64e7fb2315e7e6cf3d85003846a0828941e0969e86f86c94ee2987550b4b
+DIST erobot-2.1.0.tar.bz2 8748 BLAKE2B 920ef81a774b12cce29f8aaa75e4fa2462e034f91a2e1c791817f22d79387067d2760662b4c838d7b73d04cd88e9eb17045c6df6abbb5df4c944513e50a19222 SHA512 a5e8ad1d6cbc736302d846576a3effb6ef6a22b31677e604374df50920435a8082a8b3124a3a76c5086a066956ba457bfb4d2477cdc16ae45919aa7dd8c7e874
+EBUILD erobot-2.1.0-r1.ebuild 388 BLAKE2B 831ea91c1b741638f5a3ded855d1ced41a8ca1bb30b2c27f98250e8cdaefa1cf335def4ebed23cea9fcd1e1161284e53ffb571887761930c853687840d270820 SHA512 c89ba622de92643650abdf649228dc73cd689d5ce3832f12882d916994be16da153ca582ac11b631722a3c5f7e73b90d0d0560e2376d88975ae2302d89738f9d
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/erobot/erobot-2.1.0-r1.ebuild b/app-emacs/erobot/erobot-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..86427fec6924
--- /dev/null
+++ b/app-emacs/erobot/erobot-2.1.0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Battle-bots for Emacs!"
+HOMEPAGE="https://www.emacswiki.org/emacs/EmacsRobots"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+ELISP_PATCHES="${P}-fix-interactive.patch"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/erobot/files/50erobot-gentoo.el b/app-emacs/erobot/files/50erobot-gentoo.el
new file mode 100644
index 000000000000..9ca415017af3
--- /dev/null
+++ b/app-emacs/erobot/files/50erobot-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'erobot "erobot" "Starts a game of erobot." t)
+(autoload 'erobot-tour "erobot"
+ "Introduction to some of the erobots included in the package." t)
diff --git a/app-emacs/erobot/files/erobot-2.1.0-fix-interactive.patch b/app-emacs/erobot/files/erobot-2.1.0-fix-interactive.patch
new file mode 100644
index 000000000000..69b195170a85
--- /dev/null
+++ b/app-emacs/erobot/files/erobot-2.1.0-fix-interactive.patch
@@ -0,0 +1,11 @@
+--- erobot.el~ 2002-09-28 21:25:39.000000000 +0200
++++ erobot.el 2007-04-21 11:57:15.000000000 +0200
+@@ -230,7 +230,7 @@
+ `erobot-max-turns' has been exceeded, or if the char q is pressed
+ while the game is running. When the game ends, the candidates on
+ the map are returned in a list."
+- (interactive "i\n\naCandidate A: \naCandidate B: ")
++ (interactive "aCandidate A: \naCandidate B: ")
+ ;; Place candidates on the map and set erobot-candidates
+ (setq erobot-candidates nil)
+ (erobot-initialize candidates)
diff --git a/app-emacs/erobot/metadata.xml b/app-emacs/erobot/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/erobot/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/eselect-mode-1.4.12 b/app-emacs/eselect-mode-1.4.12
deleted file mode 100644
index 4557663f320c..000000000000
--- a/app-emacs/eselect-mode-1.4.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major mode for editing eselect files
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.12.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=d4294194c07c7704346ad6661075a6b9
diff --git a/app-emacs/eselect-mode-1.4.13 b/app-emacs/eselect-mode-1.4.13
deleted file mode 100644
index ffb51f65663a..000000000000
--- a/app-emacs/eselect-mode-1.4.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major mode for editing eselect files
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.13.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=a9c3481235d0004c1abcbb9e4e57abbc
diff --git a/app-emacs/eselect-mode-9999 b/app-emacs/eselect-mode-9999
deleted file mode 100644
index e597034ddf75..000000000000
--- a/app-emacs/eselect-mode-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Emacs major mode for editing eselect files
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 git-r3 8f6de46b0aa318aea0e8cac62ece098b
-_md5_=56b653dc070aca53252610b5c684f5fa
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
new file mode 100644
index 000000000000..9949d27f4fff
--- /dev/null
+++ b/app-emacs/eselect-mode/Manifest
@@ -0,0 +1,7 @@
+AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58ac6e3f7cc44c68a16d49c9156cf37285778a38bf97a1f4805a22d6d5cf9d597acdcdedfd77c62a5825a0d1d88f SHA512 200da398adf72241112bcda74b432a8a313cf29018c9f6fbdf6021674b23a201ada6ba884d4c9c3a4ee4c042d6c8fc7c3ba59702c8ddb6ea20b652f9ded9d32f
+DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
+DIST eselect-1.4.13.tar.xz 177848 BLAKE2B 70e5a793759e16119f5233b2c974e0fcc8d213b2033e2b3b76e0a047797b1a0f2feb21ad3beda72f644b498725b4d8ff5c221dcd0870adf5197eaf81c6f3c895 SHA512 5ce10bd288268bc5b52031703f8ac8f3cf07bb22039339bb00c92583ed226162ea8865788f5c1ff4e058d38f0bf25e3557273fb1e839e0391c1fafb9f702bc11
+EBUILD eselect-mode-1.4.12.ebuild 573 BLAKE2B 49644f3440da18f4cbf22d6681edca141578776cb899cf25b888200eb99ff0b9068919e24d6c86c46ca41005763a94f951d598a5916f78949fbb99bbf830f622 SHA512 f4a8c484fb16d0408abeb8e269a034b71046cfdb2686462c5c7e64cce27f03ad71f6172cbf4fb0fbb9e91eb7ebed73f196d68de04bb26d7a4aed3644777a850c
+EBUILD eselect-mode-1.4.13.ebuild 585 BLAKE2B 95b276e93a07acf68a05fc66a0856cf1254075a2a3280a1b22c4f5ec56ddbf366efff50295bb6d7355aa14fdb95c30f7e3da5126eff96edf03647dc744805e73 SHA512 5f3dda333a11bfae3afd5e4377f5f3ab74d11be4690035ed2aaefcd47bfc00b7363d560117e256c41539ab8cc98894c9b642347b7302673e55776a97cbb29c56
+EBUILD eselect-mode-9999.ebuild 458 BLAKE2B 0a5b748fc09dbfe532ec9b40adbbb939bd5150ecac9ee610ad0dc5b37e7b6ccdcb8c183337d6f0ce04ee5bfad4f1ede0c13cc4dc55c828474b07265fd91ffba3 SHA512 5d11532145273d6956274ce05d732352593a20daa1d86f900b1fa9927aa536131e5ec922996f4e3939803253e5649f6c2a3ec9a81dabd6dac0475422cf0a4ceb
+MISC metadata.xml 449 BLAKE2B 711e97a9feb5a464b81a738024f1f8b1ea4dcf2dab78f1e814fcb30569df5a3192cc6e72308687bffd9f7c806f3ce37ef62856f86737d3e8aa4334f721a2fd7b SHA512 38b645859453423cb80be836dc712364d5650f07f071c44d07ad7f5f629b8efd0d26535ebf61e8c38281e8426109ef5828015e01b3377486ab28f942163d155b
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.12.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.12.ebuild
new file mode 100644
index 000000000000..29d3cebf28eb
--- /dev/null
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.12.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+MY_P="eselect-${PV}"
+DESCRIPTION="Emacs major mode for editing eselect files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${MY_P}/misc"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.13.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.13.ebuild
new file mode 100644
index 000000000000..349169b3ecde
--- /dev/null
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.13.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+MY_P="eselect-${PV}"
+DESCRIPTION="Emacs major mode for editing eselect files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${MY_P}/misc"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/eselect-mode/eselect-mode-9999.ebuild b/app-emacs/eselect-mode/eselect-mode-9999.ebuild
new file mode 100644
index 000000000000..92002f841bae
--- /dev/null
+++ b/app-emacs/eselect-mode/eselect-mode-9999.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="eselect"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/eselect.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${MY_PN}"
+
+inherit elisp git-r3
+
+DESCRIPTION="Emacs major mode for editing eselect files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+S="${WORKDIR}/${MY_PN}/misc"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/eselect-mode/files/50eselect-mode-gentoo.el b/app-emacs/eselect-mode/files/50eselect-mode-gentoo.el
new file mode 100644
index 000000000000..05e2275ee322
--- /dev/null
+++ b/app-emacs/eselect-mode/files/50eselect-mode-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'eselect-mode "eselect-mode" "Major mode for .eselect files." t)
+(add-to-list 'auto-mode-alist '("\\.eselect\\'" . eselect-mode))
diff --git a/app-emacs/eselect-mode/metadata.xml b/app-emacs/eselect-mode/metadata.xml
new file mode 100644
index 000000000000..173f63b7dd6a
--- /dev/null
+++ b/app-emacs/eselect-mode/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <maintainer status="active">
+ <email>eselect@gentoo.org</email>
+ <name>eselect configuration and management tool</name>
+ </maintainer>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/ess-15.09.2 b/app-emacs/ess-15.09.2
deleted file mode 100644
index 17f58a6d0d16..000000000000
--- a/app-emacs/ess-15.09.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-text/texi2html virtual/latex-base >=virtual/emacs-23
-DESCRIPTION=Emacs Speaks Statistics
-EAPI=6
-HOMEPAGE=http://ess.r-project.org/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2+ GPL-3+ Texinfo-manual
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://ess.r-project.org/downloads/ess/ess-15.09-2.tgz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=1da5ffdc9441badc679354e89782ccc8
diff --git a/app-emacs/ess-16.04 b/app-emacs/ess-16.04
deleted file mode 100644
index 0d38706a7d5e..000000000000
--- a/app-emacs/ess-16.04
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-text/texi2html virtual/latex-base >=virtual/emacs-23
-DESCRIPTION=Emacs Speaks Statistics
-EAPI=6
-HOMEPAGE=http://ess.r-project.org/
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2+ GPL-3+ Texinfo-manual
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://ess.r-project.org/downloads/ess/ess-16.04.tgz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=325d57ae9a08564e86c16962bfb67661
diff --git a/app-emacs/ess-17.11 b/app-emacs/ess-17.11
deleted file mode 100644
index fa8544675809..000000000000
--- a/app-emacs/ess-17.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-text/texi2html virtual/latex-base >=virtual/emacs-23
-DESCRIPTION=Emacs Speaks Statistics
-EAPI=6
-HOMEPAGE=http://ess.r-project.org/
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2+ GPL-3+ Texinfo-manual
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://ess.r-project.org/downloads/ess/ess-17.11.tgz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=8b0cff49eef44d3a0c91de39c8f88668
diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
new file mode 100644
index 000000000000..15065e858875
--- /dev/null
+++ b/app-emacs/ess/Manifest
@@ -0,0 +1,8 @@
+AUX 50ess-gentoo.el 58 BLAKE2B a643ea2780e8bb7c211ad438b41d709d39e3484a99ab1d603c86843aad92a66b8bbfc1bbe9a81c25fcc19cb68fa9de7d657bb99889704cc9593e61bff43e227c SHA512 e9023d176d39d3d3c35e004747007892e6f2e2b101b3c8e64fadc37d1fac8d264a786b7bad26c744730fec03580d7fb1170c8d2789e76e12b4eb47481b7f2808
+DIST ess-15.09-2.tgz 3248241 BLAKE2B 63e83436e60d6f9398dabaaed2aa795dee8888f3a992749bdf6ab9541464c65297c29e1d2936d3e6b1da6284c0c3508556b30a6b5a68e4e090e8e1ce3d925894 SHA512 9ba2f8800ece437e18749e29b6ecec3cf52297fa1c5a149dbf8eeb991df4f5dc99a76925458bd03203b7e8418347c4bcb5226e08dc64bd95d16e9a5b32f8634b
+DIST ess-16.04.tgz 3265496 BLAKE2B 2b7b9c972afb0fdea1b8c386d91ab0f2797c8ab1bf0e6a9ca17915670d7e4d61afbec108beb5e61fe7e0491f851aac21d5c2145c6c61d77b3be4046448479580 SHA512 5070197c8c622c83db98100272aa3bc947a0687fa357db1d63dab81b30175d7044f1eb5dc7274039f85636c613d23ad7b84eaae5ccef0cca7061d6d5af7b97d6
+DIST ess-17.11.tgz 3275703 BLAKE2B 50ec08040135fb05be35494829b347f1ce1c8fdb8bbc5c11f9327800cbfafbb4e7dd5dc46c2b6ce8d506e4e9ade90e369d14c0498e06f990eccbbacbb7d16cec SHA512 b2bb09d079922ed8bded04387e6aecd38d760d7a3b9a521044fb7e2537fdc0cbb59c707e5aa550fc76aa92a6c47eab0fa40f554060707cfc7656b19adbdea222
+EBUILD ess-15.09.2.ebuild 1164 BLAKE2B 8a3105ca2a7ff0acdf27c3b9a061a395a8eb005511c3515d286eb99b4aa1ba3b43ecc21c82bb01f82438934f47b4ca1f9a8723a82ba001b37d5e1d899815f52b SHA512 ae190fba951333cad7300484d6988ca1d6e2954697a36c719a0616b99b10911d00846f63f5a5c5ba2662ec90eaf9f9d991ef0be55a01c89c71263a28011c1067
+EBUILD ess-16.04.ebuild 1114 BLAKE2B fa5a7812a40748d429fa77e151e8ef1cb987bf6e59a1853d2ba804d87ac28323f8fa5b4b1013578cb90886e25038b44e687209167953f17ce1d6665d261d4c77 SHA512 10a7ba2643a5e04e8b9fb3d80bf27f5e1ff02de0443f0cf7791e99defabf6e08959625c60938458c3d9ba612e7df8b96b46ff845af48220959ab0c5d9669fa16
+EBUILD ess-17.11.ebuild 1114 BLAKE2B 09fc93db9bdc861c44b1778705d06ce2993b05408dc558407390eb5cc7aff64be4c6e80749386604e1e61d5e03935e25bc95f9c15f124b3ea61f04e444b2c3ea SHA512 6e56b5d0b043c260cddd30907f2d9347c9622d4fc23ac365c4e84255fa1a75523eab6fb9df7a4c8ae231ba4a250cf5a4794e97f31cacd3f5c5e00c08d2f825c1
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/ess/ess-15.09.2.ebuild b/app-emacs/ess/ess-15.09.2.ebuild
new file mode 100644
index 000000000000..14e85a135646
--- /dev/null
+++ b/app-emacs/ess/ess-15.09.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp readme.gentoo-r1
+
+MY_P="${PN}-${PV%.*}-${PV##*.}"
+DESCRIPTION="Emacs Speaks Statistics"
+HOMEPAGE="http://ess.r-project.org/"
+SRC_URI="http://ess.r-project.org/downloads/ess/${MY_P}.tgz"
+
+LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+DEPEND="app-text/texi2html
+ virtual/latex-base"
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ default
+}
+
+src_install() {
+ emake PREFIX="${ED}/usr" \
+ INFODIR="${ED}/usr/share/info" \
+ LISPDIR="${ED}${SITELISP}/ess" \
+ DOCDIR="${ED}/usr/share/doc/${PF}" \
+ install
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ # Most documentation is installed by the package's build system.
+ rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
+ dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
+ newdoc doc/ChangeLog ChangeLog-doc
+ newdoc lisp/ChangeLog ChangeLog-lisp
+
+ DOC_CONTENTS="Please see /usr/share/doc/${PF} for the complete
+ documentation. Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/ess/ess-16.04.ebuild b/app-emacs/ess/ess-16.04.ebuild
new file mode 100644
index 000000000000..b3242a8d0323
--- /dev/null
+++ b/app-emacs/ess/ess-16.04.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Emacs Speaks Statistics"
+HOMEPAGE="http://ess.r-project.org/"
+SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
+
+LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+DEPEND="app-text/texi2html
+ virtual/latex-base"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ default
+}
+
+src_install() {
+ emake PREFIX="${ED}/usr" \
+ INFODIR="${ED}/usr/share/info" \
+ LISPDIR="${ED}${SITELISP}/ess" \
+ DOCDIR="${ED}/usr/share/doc/${PF}" \
+ install
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ # Most documentation is installed by the package's build system.
+ rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
+ dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
+ newdoc doc/ChangeLog ChangeLog-doc
+ newdoc lisp/ChangeLog ChangeLog-lisp
+
+ DOC_CONTENTS="Please see /usr/share/doc/${PF} for the complete
+ documentation. Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/ess/ess-17.11.ebuild b/app-emacs/ess/ess-17.11.ebuild
new file mode 100644
index 000000000000..6cda31d72ab8
--- /dev/null
+++ b/app-emacs/ess/ess-17.11.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Emacs Speaks Statistics"
+HOMEPAGE="http://ess.r-project.org/"
+SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
+
+LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+DEPEND="app-text/texi2html
+ virtual/latex-base"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ default
+}
+
+src_install() {
+ emake PREFIX="${ED}/usr" \
+ INFODIR="${ED}/usr/share/info" \
+ LISPDIR="${ED}${SITELISP}/ess" \
+ DOCDIR="${ED}/usr/share/doc/${PF}" \
+ install
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ # Most documentation is installed by the package's build system.
+ rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
+ dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
+ newdoc doc/ChangeLog ChangeLog-doc
+ newdoc lisp/ChangeLog ChangeLog-lisp
+
+ DOC_CONTENTS="Please see /usr/share/doc/${PF} for the complete
+ documentation. Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/ess/files/50ess-gentoo.el b/app-emacs/ess/files/50ess-gentoo.el
new file mode 100644
index 000000000000..597e41c706fb
--- /dev/null
+++ b/app-emacs/ess/files/50ess-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'ess-site)
diff --git a/app-emacs/ess/metadata.xml b/app-emacs/ess/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/ess/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/evil-1.0.8 b/app-emacs/evil-1.0.8
deleted file mode 100644
index 21c32f0a5531..000000000000
--- a/app-emacs/evil-1.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/undo-tree-0.6.3 sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=Extensible vi layer for Emacs
-EAPI=5
-HOMEPAGE=https://github.com/emacs-evil/evil
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+ FDL-1.3+
-RDEPEND=>=app-emacs/undo-tree-0.6.3 >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/evil-1.0.8.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=93f1a7384a166e5a1c1a795131e7520e
diff --git a/app-emacs/evil-1.2.13 b/app-emacs/evil-1.2.13
deleted file mode 100644
index d7beb3181513..000000000000
--- a/app-emacs/evil-1.2.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/undo-tree-0.6.3 sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=Extensible vi layer for Emacs
-EAPI=6
-HOMEPAGE=https://github.com/emacs-evil/evil
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ FDL-1.3+
-RDEPEND=>=app-emacs/undo-tree-0.6.3 >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/emacs-evil/evil/archive/1.2.13.tar.gz -> evil-1.2.13.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=a82dbf926d147f57a100f151bb22bd04
diff --git a/app-emacs/evil/Manifest b/app-emacs/evil/Manifest
new file mode 100644
index 000000000000..bea2490bc5ec
--- /dev/null
+++ b/app-emacs/evil/Manifest
@@ -0,0 +1,6 @@
+AUX 50evil-gentoo.el 99 BLAKE2B 9ebd3d4d3a09091e822cbb6bc8d50890c6b46d627ef83d9d6ad8b518f0dd11a766ede08898746b0cd7e2657aa584c58535927716dfacf656802e840e13b4b861 SHA512 fb934f37d51412b59b8d5a7d27a7791d2db547bf1d71fd0a5b85bd31d24e2a663e92272095b6b2fe0cf44cac6ae69ed1a422b6b4ef0c6533e004018cfa6011b3
+DIST evil-1.0.8.tar.xz 427884 BLAKE2B 9a2327d268c7d64c2b439788a3d6fc8104ad2554bce150431efeecd9c6db8dd41acb2e5886328ccfd21a3a94d56962cc9167ec53b3abb785565783beb213acdb SHA512 d827ff8856c0240c334088f4c61226c93994a4c5afdd775a7170233add884af134b22cdc8bfa6432d3f44d3e6cf3cea89501a4ebfdc37ed5c70b3c712ad2ea86
+DIST evil-1.2.13.tar.gz 540559 BLAKE2B 064d746415775653a6152557645324d6900edff39ecab409105bb2ea8f810a3ff8e706acc776e4749c6d9675c2e5e4798bc9744056130a24b3c6382a2eafdbb8 SHA512 30d6f65db234c8c23cd31d1fbd9347e71b7d47ed7a9b50161c3e5820243dca2d9ce661469a1f141be08f89aeaaa5d2d04fce5a6bc8f38285e6a5229c6a05dcf7
+EBUILD evil-1.0.8.ebuild 572 BLAKE2B afc89b49665303344521cd58d7bc0c290806675d0ae48b7c65f6b692029f129056e9bdedb822c2c28849960f9e113b851af997647b430e60027dad3dc51cfcf4 SHA512 342e34601d77161155ed3a60a5f3713a00c2edba07c101498063b3fb0f7ad6c40df86ac4a7b65ad7c6b07ff734013a55b0b4b4cfc7308cf78f389c7b85140c59
+EBUILD evil-1.2.13.ebuild 622 BLAKE2B 87f507d8f2f4545c978e586c4c77298d519adb783c08be3187f591db007b040aaf079cc410eb7110bc7c899f5a73acb42bbf82d709bbf954224977d047ffe77c SHA512 a2a8d87e46f50ed562880aeaac8616019152ca2322dd1a4bf2aa029a23c4e3c86410f37c033e5fa6fbe1e397d95e38a296b43b168e9249c2b5325ac8715cb699
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/evil/evil-1.0.8.ebuild b/app-emacs/evil/evil-1.0.8.ebuild
new file mode 100644
index 000000000000..e9a11acabe1e
--- /dev/null
+++ b/app-emacs/evil/evil-1.0.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Extensible vi layer for Emacs"
+HOMEPAGE="https://github.com/emacs-evil/evil"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+RESTRICT="test"
+
+RDEPEND=">=app-emacs/undo-tree-0.6.3"
+DEPEND="${RDEPEND}
+ sys-apps/texinfo"
+
+S="${WORKDIR}/${PN}"
+ELISP_REMOVE="evil-pkg.el evil-tests.el"
+ELISP_TEXINFO="doc/evil.texi"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="CHANGES.org"
diff --git a/app-emacs/evil/evil-1.2.13.ebuild b/app-emacs/evil/evil-1.2.13.ebuild
new file mode 100644
index 000000000000..6163a663e1d4
--- /dev/null
+++ b/app-emacs/evil/evil-1.2.13.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Extensible vi layer for Emacs"
+HOMEPAGE="https://github.com/emacs-evil/evil"
+SRC_URI="https://github.com/emacs-evil/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND=">=app-emacs/undo-tree-0.6.3"
+DEPEND="${RDEPEND}
+ sys-apps/texinfo"
+
+ELISP_REMOVE="evil-pkg.el evil-tests.el evil-test-helpers.el"
+ELISP_TEXINFO="doc/evil.texi"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="CHANGES.org CONTRIBUTING.md README.md"
diff --git a/app-emacs/evil/files/50evil-gentoo.el b/app-emacs/evil/files/50evil-gentoo.el
new file mode 100644
index 000000000000..390e532e09a0
--- /dev/null
+++ b/app-emacs/evil/files/50evil-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'evil-mode "evil" "Toggle Evil in all buffers." t)
diff --git a/app-emacs/evil/metadata.xml b/app-emacs/evil/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/evil/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/expand-region-0.11.0 b/app-emacs/expand-region-0.11.0
deleted file mode 100644
index d0cac17b6f68..000000000000
--- a/app-emacs/expand-region-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs extension to increase selected region by semantic units
-EAPI=6
-HOMEPAGE=https://github.com/magnars/expand-region.el
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/magnars/expand-region.el/archive/0.11.0.tar.gz -> expand-region-0.11.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=f202b3e8272591c85d33aeb45faf7bb1
diff --git a/app-emacs/expand-region/Manifest b/app-emacs/expand-region/Manifest
new file mode 100644
index 000000000000..6a4e98f4b8ab
--- /dev/null
+++ b/app-emacs/expand-region/Manifest
@@ -0,0 +1,4 @@
+AUX 50expand-region-gentoo.el 77 BLAKE2B 7603fc780a91f92a2f3e33daf87cf77f4d2f7ff23340b40d382edf304d3b912ac2728b66521718cad0f88f36749547ee27f40b2db14b3fd0a54da81db29f4dc4 SHA512 a2ac0c38a2693979ead82dbde2f88161315fa62e1632a3be242ae158caa0e4ce91585d11eb61265955910294e9e483834d282917ed6ebdd7da8d82fd496f72ee
+DIST expand-region-0.11.0.tar.gz 31562 BLAKE2B 84058b1aea880de0f4a1894bbf818ae622ec7740d15564e74adbe8f3769f72b514d71de9c6b83a8f0fd60c590e281739ae15110f5f886315cc10b661b21ecc56 SHA512 3469ab0420d85fbaaa1ae9f3d0101c28b6e1786d761ecd186d744537795226917314b8b748d3499b02ea269a46a62350c37fecb34dd4183a73eafc67ce1344a8
+EBUILD expand-region-0.11.0.ebuild 547 BLAKE2B 52228ed4880da2b2f7bd26e7c0266e08e9f28d6c88cb432818db7f6f98b194f42ef8f23b5c9f2818fb9461042e4b5a4579fee80a50cc11575918e1fc79d06c88 SHA512 860286841c831c01a36b9b311e480b5111bbacd6fcf012831a5e91b855fcd367612e7be597ae87145d1eb63adb83a6da37d349f980319bf11909fec7e805fad9
+MISC metadata.xml 385 BLAKE2B 8ee4d6d5a7902e2af24e945e0b2e4c1ad420d3f4e17929cdece4887fdb699631f03c67b43de4e4f9f3e4e19d28d930cda896abe4b757fba9279b65f86af30f79 SHA512 b3105d6005b9923703dddd1b27b5769f002a419aa926c66f841cc5cbf975f0a3634abc6dc417e0da69243922264a3c7885e2118780c7b911f69bea23153c2f7a
diff --git a/app-emacs/expand-region/expand-region-0.11.0.ebuild b/app-emacs/expand-region/expand-region-0.11.0.ebuild
new file mode 100644
index 000000000000..b151534d2ef7
--- /dev/null
+++ b/app-emacs/expand-region/expand-region-0.11.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Emacs extension to increase selected region by semantic units"
+HOMEPAGE="https://github.com/magnars/expand-region.el"
+SRC_URI="https://github.com/magnars/expand-region.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/expand-region.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
+
+src_compile() {
+ elisp-compile *.el
+ elisp-make-autoload-file
+}
diff --git a/app-emacs/expand-region/files/50expand-region-gentoo.el b/app-emacs/expand-region/files/50expand-region-gentoo.el
new file mode 100644
index 000000000000..bd5b40540780
--- /dev/null
+++ b/app-emacs/expand-region/files/50expand-region-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "expand-region-autoloads" nil t)
diff --git a/app-emacs/expand-region/metadata.xml b/app-emacs/expand-region/metadata.xml
new file mode 100644
index 000000000000..b42030db7aee
--- /dev/null
+++ b/app-emacs/expand-region/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <stabilize-allarches/>
+ <upstream>
+ <remote-id type="github">magnars/expand-region.el</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-emacs/f-0.18.2 b/app-emacs/f-0.18.2
deleted file mode 100644
index 6afaff82e3a7..000000000000
--- a/app-emacs/f-0.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/dash app-emacs/s >=virtual/emacs-23
-DESCRIPTION=Modern API for working with files and directories in Emacs
-EAPI=6
-HOMEPAGE=https://github.com/rejeep/f.el
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=app-emacs/dash app-emacs/s >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rejeep/f.el/archive/v0.18.2.tar.gz -> f-0.18.2.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=7a9da92b807a341d6ba095067abdb864
diff --git a/app-emacs/f-0.19.0 b/app-emacs/f-0.19.0
deleted file mode 100644
index c9408179e956..000000000000
--- a/app-emacs/f-0.19.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/dash app-emacs/s >=virtual/emacs-23
-DESCRIPTION=Modern API for working with files and directories in Emacs
-EAPI=6
-HOMEPAGE=https://github.com/rejeep/f.el
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=app-emacs/dash app-emacs/s >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/rejeep/f.el/archive/v0.19.0.tar.gz -> f-0.19.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=7a9da92b807a341d6ba095067abdb864
diff --git a/app-emacs/f/Manifest b/app-emacs/f/Manifest
new file mode 100644
index 000000000000..42d093eefb43
--- /dev/null
+++ b/app-emacs/f/Manifest
@@ -0,0 +1,6 @@
+AUX 50f-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST f-0.18.2.tar.gz 18485 BLAKE2B 5b450b82eb31b23243a14308121380f53310de6b312c0b6c821b478d81019f20e0ca1765e267ed53a715aae626dabf743e978acfc9202559e14166fb5fda332f SHA512 5b11084dcc6afcc85ed0e187f6dd252c391fa43325be5b88b776171b3bc7076ea2bbd32b7c424deb70e035f6acd46acd86053547663502530832db2c50eba346
+DIST f-0.19.0.tar.gz 19477 BLAKE2B 47cfb8c876e11cae7eca61815085c4290f65f9d72a7c5d397d8b53f6d57421f46997786556074027de5405acbf38ddb42ecbb767c809763e84d880286e6942dc SHA512 694eca1872cb0a0da7f75f610e4101993a79a5e7601c3f72fd2c642b1a44f5eada24777313b5166d901d9d983c18b4d412b4c6f01c382ace7530bacaa3b67c56
+EBUILD f-0.18.2.ebuild 516 BLAKE2B d79552b1a98a6abb0d0f0a3339c425aa6d1c6e763cd814c5764e5a3f47e3909f9303b3868cc072b1523b35cd73f838b1228f178f30c008e8b28ba9de03ef0022 SHA512 679ec5a1dc6a778582ab90b55a2f6e65cd10dfd846b44d2f2900acd9f1ce70f1029b06336e38e025a7417dfc4e61c70986b9a9fd7674a20f5999fe143dffdebb
+EBUILD f-0.19.0.ebuild 516 BLAKE2B d79552b1a98a6abb0d0f0a3339c425aa6d1c6e763cd814c5764e5a3f47e3909f9303b3868cc072b1523b35cd73f838b1228f178f30c008e8b28ba9de03ef0022 SHA512 679ec5a1dc6a778582ab90b55a2f6e65cd10dfd846b44d2f2900acd9f1ce70f1029b06336e38e025a7417dfc4e61c70986b9a9fd7674a20f5999fe143dffdebb
+MISC metadata.xml 372 BLAKE2B 5ed577f7fa8b397ecfd738274b02ed1204aac09546624852be6698d88f15264d6edfe2a31528e9cf9a8051fcd6a53831ee7b0f024deaff2f652ede945f837e54 SHA512 5c0147862c0d432fab74199058bb650eca428cef988fd1f4a7d654f1cb13393e02f1193be3434b397489c9554e13a719d128e0d9c6c31d4b0cb496bdaf176a31
diff --git a/app-emacs/f/f-0.18.2.ebuild b/app-emacs/f/f-0.18.2.ebuild
new file mode 100644
index 000000000000..c29120179b0b
--- /dev/null
+++ b/app-emacs/f/f-0.18.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Modern API for working with files and directories in Emacs"
+HOMEPAGE="https://github.com/rejeep/f.el"
+SRC_URI="https://github.com/rejeep/f.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+RDEPEND="app-emacs/dash app-emacs/s"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/f.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emacs/f/f-0.19.0.ebuild b/app-emacs/f/f-0.19.0.ebuild
new file mode 100644
index 000000000000..c29120179b0b
--- /dev/null
+++ b/app-emacs/f/f-0.19.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Modern API for working with files and directories in Emacs"
+HOMEPAGE="https://github.com/rejeep/f.el"
+SRC_URI="https://github.com/rejeep/f.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+RDEPEND="app-emacs/dash app-emacs/s"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/f.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emacs/f/files/50f-gentoo.el b/app-emacs/f/files/50f-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/f/files/50f-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/f/metadata.xml b/app-emacs/f/metadata.xml
new file mode 100644
index 000000000000..b6f003569883
--- /dev/null
+++ b/app-emacs/f/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <stabilize-allarches/>
+ <upstream>
+ <remote-id type="github">rejeep/f.el</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-emacs/fff-20050517 b/app-emacs/fff-20050517
deleted file mode 100644
index 610073813ef4..000000000000
--- a/app-emacs/fff-20050517
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Fast file finder for Emacs
-EAPI=5
-HOMEPAGE=http://www.splode.com/~friedman/software/emacs-lisp/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=sys-apps/mlocate >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/fff-20050517.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=12b1675b84a5227ea8320a27133f2636
diff --git a/app-emacs/fff/Manifest b/app-emacs/fff/Manifest
new file mode 100644
index 000000000000..93fc855ac3b4
--- /dev/null
+++ b/app-emacs/fff/Manifest
@@ -0,0 +1,4 @@
+AUX 50fff-gentoo.el 911 BLAKE2B e26758fc4d072cdab055090879d3246583393f86491afe8fbd4ec24e4a40d02bd699a8695460a4840ad6fc0d59c37859a780e92ea5df622046a5f8cc12a58f96 SHA512 b5c50da8e123d8cac658d6ab4f9c1fb3c6c2186c90753c70b6453f611999979873234b270f0b9265b8e8c452c94541d140b6ae7631f546bf249968934bc36d4e
+DIST fff-20050517.tar.bz2 13774 BLAKE2B 2b98f7d7c1b557839a879375d92d6f030685956f60eceb5414afd31a629792afb41c5690f65e81edec7dfaca8407107c4d50a5f1a40989fdec55cc2cd6aaa34e SHA512 829a833a25378d868db0dad04d062c397336aa98167fd5706a9c75a7ec4c60a49bc77b5dfa9ed9f48565d09ae2817fafeffeb7546b5e5bbfcd13c78fcdfc9939
+EBUILD fff-20050517.ebuild 381 BLAKE2B 93c931f289a3f932baf9c46f53b377cbe120e329472220365b864d742ed1c957e3e5beb3e971c6cca6f29bb68ab6ad3cfbf3f99501a61296f5a1b7909f66b8fa SHA512 4da75faf1356b84950939c33e901e4a9b485a7991595389c389128a2996fedb6168dcc8725334e0b1bec8919651d57c0413d89a849f99c9ff14bd87ecc436ab9
+MISC metadata.xml 721 BLAKE2B 24ef6c184690e15233758f7c36f2845d662ab56426bce3cf6cc5ad1cdb71b0eaf8393e4469de00090a56fad7b4fb583ee3055dd77027e930e539e934601941d2 SHA512 4d8a05989e3c6a661471102baf0af7df5a057b3b4662789d42c839039143ff4f85fb5f471b9e4c2a503839761c0e04baedd70307b717b797ab1861415c428cf7
diff --git a/app-emacs/fff/fff-20050517.ebuild b/app-emacs/fff/fff-20050517.ebuild
new file mode 100644
index 000000000000..a4677492657b
--- /dev/null
+++ b/app-emacs/fff/fff-20050517.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Fast file finder for Emacs"
+HOMEPAGE="http://www.splode.com/~friedman/software/emacs-lisp/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="sys-apps/mlocate"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/fff/files/50fff-gentoo.el b/app-emacs/fff/files/50fff-gentoo.el
new file mode 100644
index 000000000000..84df8bdd9e8b
--- /dev/null
+++ b/app-emacs/fff/files/50fff-gentoo.el
@@ -0,0 +1,17 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'fff-find-file-in-envvar-path "fff" nil t)
+(autoload 'fff-insert-file-in-envvar-path "fff" nil t)
+(autoload 'fff-find-file-in-exec-path "fff" nil t)
+(autoload 'fff-insert-file-in-exec-path "fff" nil t)
+(autoload 'fff-find-file-in-path "fff" nil t)
+(autoload 'fff-insert-file-in-path "fff" nil t)
+(autoload 'fff-find-file-in-locate-db "fff" nil t)
+(autoload 'fff-insert-file-in-locate-db "fff" nil t)
+(autoload 'fff-install-map "fff" nil t)
+(autoload 'fff-find-emacs-lisp-library "fff-elisp" nil t)
+(autoload 'fff-insert-emacs-lisp-library "fff-elisp" nil t)
+(autoload 'fff-locate-emacs-lisp-library "fff-elisp" nil t)
+(autoload 'fff-find-loaded-elisp-function-or-variable "fff-elisp" nil t)
+(autoload 'fff-elisp-install-map "fff-elisp" nil t)
+(autoload 'fff-find-rfc "fff-rfc" nil t)
+(autoload 'fff-rfc-install-map "fff-rfc" nil t)
diff --git a/app-emacs/fff/metadata.xml b/app-emacs/fff/metadata.xml
new file mode 100644
index 000000000000..ef4d2c5a9445
--- /dev/null
+++ b/app-emacs/fff/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ This package provides several shortcut commands for visiting or
+ inserting files without having to specify them by their complete name.
+ For example, you can visit programs in your exec-path (some of which
+ may be humanly-readable shell scripts or config files), or anything
+ else which is quickly locatable via a prebuilt database or path list.
+ Completion is also available for many commands.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/filladapt-2.12-r1 b/app-emacs/filladapt-2.12-r1
deleted file mode 100644
index efdb0873529c..000000000000
--- a/app-emacs/filladapt-2.12-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Filladapt enhances the behavior of Emacs' fill functions
-EAPI=5
-HOMEPAGE=http://www.wonderworks.com/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/filladapt-2.12.el.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e584814ec6d6ce5d55baa51e8c0d862
diff --git a/app-emacs/filladapt/Manifest b/app-emacs/filladapt/Manifest
new file mode 100644
index 000000000000..9b02b0802c25
--- /dev/null
+++ b/app-emacs/filladapt/Manifest
@@ -0,0 +1,4 @@
+AUX 50filladapt-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST filladapt-2.12.el.gz 9267 BLAKE2B 81510bd51808f7aaa4874a1127a74bfc7d35c5f1dca0100694853025fd1bc884d75c2023f0e373eb1fe69cc5d423a48d884b4ff5cfdfc82b161f6a404965b6bd SHA512 31bf3dca48129cc25653827678215eb4c62ff777cfbdf0d71142c0cc3111a078b1af316e121b27be2a47c317cfa440ac00e7fbc2bdf3e8ac7d54748297249328
+EBUILD filladapt-2.12-r1.ebuild 579 BLAKE2B 378fd990f9d8cc913421b5274a85b1693002dd8238f747d1f42ea03afc75e7086e179d410084b9cfffa471b263ce6ba23789d020b54f57a8690011163294e121 SHA512 54c0a8bb3d6c0ee14998d098acd73ba3c1a0e11123d70d2ee0d99914e4d6bbae7301d428600026b76338fec01ed9a410528b9e541ece1088b35c12d9af0f6595
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/filladapt/files/50filladapt-gentoo.el b/app-emacs/filladapt/files/50filladapt-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/filladapt/files/50filladapt-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/filladapt/filladapt-2.12-r1.ebuild b/app-emacs/filladapt/filladapt-2.12-r1.ebuild
new file mode 100644
index 000000000000..00f83dc21851
--- /dev/null
+++ b/app-emacs/filladapt/filladapt-2.12-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+DESCRIPTION="Filladapt enhances the behavior of Emacs' fill functions"
+HOMEPAGE="http://www.wonderworks.com/"
+SRC_URI="mirror://gentoo/${P}.el.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="Filladapt is not enabled as a site default. Add the following
+ lines to your ~/.emacs file to enable adaptive fill by default:
+ \n\t(require 'filladapt)
+ \n\t(setq-default filladapt-mode t)"
diff --git a/app-emacs/filladapt/metadata.xml b/app-emacs/filladapt/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/filladapt/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/flashcard-2.3.3 b/app-emacs/flashcard-2.3.3
deleted file mode 100644
index 53b30041e2b3..000000000000
--- a/app-emacs/flashcard-2.3.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Emacs Lisp package for drilling on questions and answers
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/FlashCard
-KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/flashcard-2.3.3.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=cf43d3d1026844c736a52a42505b7d97
diff --git a/app-emacs/flashcard/Manifest b/app-emacs/flashcard/Manifest
new file mode 100644
index 000000000000..6de9bad7cd02
--- /dev/null
+++ b/app-emacs/flashcard/Manifest
@@ -0,0 +1,4 @@
+AUX 50flashcard-gentoo.el 259 BLAKE2B ff1c7488a6fb49b2144562d56712f306c8b0c64968fbcb272821948e8dabf17cd3d028f0208286ecbfa2972006b3dfdca33b02c3a2657b7562fbbb51a7e1d5d5 SHA512 576dfbf72f7d0b01ce80eb3e7d673daf8ebe5d7109dd32838008fdb9f7fe667f018ff1c086c4b3a4b2ffd6f134750b59e0236b307a1d5f0d48d7927d2c4e1c7f
+DIST flashcard-2.3.3.tar.bz2 10048 BLAKE2B 86c02a9cfae15a55302d8733f97203bc3ddd526022f47308ac58b489fac13d1bba6d362b62ff67dee767bfd33a60cfbb39d3c84f7904cf53d68f41b3ccdf985f SHA512 30d18b488549c8aba1c6e9320d10b8b566e1ff162bd5a072bb2ba3602111744d7f21cdc26fd48f7b427727c264c9017b1a8534fc402d3990d1f9bb0e0f54877c
+EBUILD flashcard-2.3.3.ebuild 386 BLAKE2B 801e244d61f470c3cdc35a9af4139876b1a94727e9a69b1e95486bb3df2906b70fe0d80d70dc412dc8883a99be0446b73b18adac752a393718a991d390f9cc22 SHA512 105e65057eb3aa575dfcc6578267865c99a066ec662d39b04e83f320b00ae524f0f3ff1b7768c6659930d30ca7f5f1eb35a3d7b761930797efd4824e4c101eb6
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/flashcard/files/50flashcard-gentoo.el b/app-emacs/flashcard/files/50flashcard-gentoo.el
new file mode 100644
index 000000000000..312dc5a87780
--- /dev/null
+++ b/app-emacs/flashcard/files/50flashcard-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'auto-mode-alist '("\\.deck\\'" . flashcard-mode))
+(autoload 'flashcard-mode "flashcard" nil t)
+(autoload 'flashcard-add-card "flashcard" nil t)
+(autoload 'flashcard-import-from-colon-file "flashcard" nil t)
diff --git a/app-emacs/flashcard/flashcard-2.3.3.ebuild b/app-emacs/flashcard/flashcard-2.3.3.ebuild
new file mode 100644
index 000000000000..c8ee0405d764
--- /dev/null
+++ b/app-emacs/flashcard/flashcard-2.3.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Emacs Lisp package for drilling on questions and answers"
+HOMEPAGE="https://www.emacswiki.org/emacs/FlashCard"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/flashcard/metadata.xml b/app-emacs/flashcard/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/flashcard/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/flim-1.14.9-r2 b/app-emacs/flim-1.14.9-r2
deleted file mode 100644
index 06addc9532f9..000000000000
--- a/app-emacs/flim-1.14.9-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/apel-10.3 >=virtual/emacs-23
-DESCRIPTION=A library to provide basic features about message representation or encoding
-EAPI=5
-HOMEPAGE=http://git.chise.org/elisp/flim/
-KEYWORDS=alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-2+
-RDEPEND=>=app-emacs/apel-10.3 !app-emacs/limit >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://git.chise.org/elisp/dist/flim/flim-1.14/flim-1.14.9.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=9b3835a95753d7271eb65319fd74a24f
diff --git a/app-emacs/flim/Manifest b/app-emacs/flim/Manifest
new file mode 100644
index 000000000000..95c81b770933
--- /dev/null
+++ b/app-emacs/flim/Manifest
@@ -0,0 +1,5 @@
+AUX 60flim-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX flim-1.14.9-mel-q-ccl.patch 1362 BLAKE2B 4883dfdb3ede7b93ec41cd02fe1da397a820101611afa51164a521aedbb780f04d2a7dbdf87e70506b2387d3edd95aacdaf46bc2adabb901b5a365ffecbca3b4 SHA512 b2edee110d53e2b31fe13ccfffd792668febd20e27a8014d77e9ad0b0a4540ab38cde97742ed67c515e58594808713edf9079812604521f1f1d481cd717a0132
+DIST flim-1.14.9.tar.gz 182065 BLAKE2B e15779e93a422bc2c2b82ab5969f2b3d30a31d47b96769abf89bfe7e9aebf74e5f0f0e87270bcc187bdaf3e1af4bdd663c7d6661f1adc9575af0e4ba1dd316f1 SHA512 a272a30f27cea24f537b9bf3a6dbb25113deff0ab8e1c03bd802e4d32d673d567d282297ed9e4d35217f069699a1fc25bfdde09778171a188dfa46f49e9bb7dd
+EBUILD flim-1.14.9-r2.ebuild 969 BLAKE2B 97aa74a6ad442c1d762001782ac19a5438dc06a4cdf06718a598aefe2e134851f97fe0cc844c84904bcb336edf2016e04d9691051f4832b0eb2b97b621ac1dce SHA512 fb65778615d632680803699f358cc8c66f422638e87308ec9a387f280a6594eec500d7ef77eb3679bdfc68511eb427e7273707ebbd714965927f82a05d07c1a7
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/flim/files/60flim-gentoo.el b/app-emacs/flim/files/60flim-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/flim/files/60flim-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/flim/files/flim-1.14.9-mel-q-ccl.patch b/app-emacs/flim/files/flim-1.14.9-mel-q-ccl.patch
new file mode 100644
index 000000000000..35f645052284
--- /dev/null
+++ b/app-emacs/flim/files/flim-1.14.9-mel-q-ccl.patch
@@ -0,0 +1,31 @@
+http://bugs.gentoo.org/292449
+
+--- flim-1.14.9-orig/mel-q-ccl.el 2006-06-12 17:10:02.000000000 +0200
++++ flim-1.14.9/mel-q-ccl.el 2009-11-13 15:38:28.000000000 +0100
+@@ -893,7 +893,13 @@
+ (defun quoted-printable-ccl-encode-region (start end)
+ "Encode the region from START to END with quoted-printable encoding."
+ (interactive "*r")
+- (decode-coding-region start end 'mel-ccl-quoted-printable-lf-lf-rev))
++ (save-excursion
++ (goto-char start)
++ (insert (prog1
++ (decode-coding-string
++ (string-as-unibyte (buffer-substring start end))
++ 'mel-ccl-quoted-printable-lf-lf-rev)
++ (delete-region start end)))))
+
+ (defun quoted-printable-ccl-insert-encoded-file (filename)
+ "Encode contents of the file named as FILENAME, and insert it."
+@@ -932,7 +938,10 @@
+ (defun quoted-printable-ccl-write-decoded-region (start end filename)
+ "Decode quoted-printable encoded current region and write out to FILENAME."
+ (interactive "*r\nFWrite decoded region to file: ")
+- (let ((coding-system-for-write 'mel-ccl-quoted-printable-lf-lf-rev)
++ (let ((coding-system-for-write
++ (if (coding-system-p 'mel-ccl-quoted-printable-lf-lf-rev-unix)
++ 'mel-ccl-quoted-printable-lf-lf-rev-unix
++ 'mel-ccl-quoted-printable-lf-lf-rev))
+ jka-compr-compression-info-list jam-zcat-filename-list)
+ (write-region start end filename)))
+
diff --git a/app-emacs/flim/flim-1.14.9-r2.ebuild b/app-emacs/flim/flim-1.14.9-r2.ebuild
new file mode 100644
index 000000000000..2586b28c2ca6
--- /dev/null
+++ b/app-emacs/flim/flim-1.14.9-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A library to provide basic features about message representation or encoding"
+HOMEPAGE="http://git.chise.org/elisp/flim/"
+SRC_URI="http://git.chise.org/elisp/dist/${PN}/${P%.*}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+
+DEPEND=">=app-emacs/apel-10.3"
+RDEPEND="${DEPEND}
+ !app-emacs/limit"
+
+ELISP_PATCHES="${P}-mel-q-ccl.patch"
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() {
+ emake PREFIX="${ED}/usr" \
+ LISPDIR="${ED}/${SITELISP}" \
+ VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}"
+}
+
+src_install() {
+ emake PREFIX="${ED}/usr" \
+ LISPDIR="${ED}/${SITELISP}" \
+ VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" install
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ dodoc FLIM-API.en NEWS VERSION README* ChangeLog
+}
diff --git a/app-emacs/flim/metadata.xml b/app-emacs/flim/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/flim/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/folding-2012.0226.1623 b/app-emacs/folding-2012.0226.1623
deleted file mode 100644
index 09939e071668..000000000000
--- a/app-emacs/folding-2012.0226.1623
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A folding-editor-like Emacs minor mode
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/FoldingMode
-KEYWORDS=alpha amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/folding-2012.0226.1623.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=3693122b6b300e800bd0c8755df59d70
diff --git a/app-emacs/folding-2013.0613.1821 b/app-emacs/folding-2013.0613.1821
deleted file mode 100644
index 2ac1ce620526..000000000000
--- a/app-emacs/folding-2013.0613.1821
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A folding-editor-like Emacs minor mode
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/FoldingMode
-KEYWORDS=alpha amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/folding-2013.0613.1821.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=7335d31607b34621f3b5ef9915f2a43c
diff --git a/app-emacs/folding/Manifest b/app-emacs/folding/Manifest
new file mode 100644
index 000000000000..e149febbf90f
--- /dev/null
+++ b/app-emacs/folding/Manifest
@@ -0,0 +1,6 @@
+AUX 50folding-gentoo.el 221 BLAKE2B f0f0b88f59d0f493a468e9128028c525315b4d2f32bf000ac39838774c34c81bda4089e000d8b05ac151e42f6e2001f636b0e98bc02c3125e3ac46459c1cf777 SHA512 e5b9f16218988429da9fdf304967deba2fd76774b5c4eca9d372504cac225ab24de4c976dbca4203d335f06d2fe16043bb817c5a232e517c4c7416e1e9f52076
+DIST folding-2012.0226.1623.el.bz2 49503 BLAKE2B 6e364c9c93c92d4e9c322b5cc75b2525d95d63fe5a5b5916e054063fb2452f8ade4cce7e805243cb95a078157f33feff1bc9890b3a7d0de66813c63c74be0dbf SHA512 efb645e46e55174f2b538b6812f36d08f576f765ffffdf25af756c852e7bfd6455cb3bc3a540089a60600251b2c144384b7f58b412840a95ce614efd9d5b50c9
+DIST folding-2013.0613.1821.el.xz 52164 BLAKE2B cb9dc74ab409ddeff8434191f53dadac5c53a15fdf4b8edb041daa156221e7271bd30bf66e60049ebd4ed761f16b1adfa113e05967cc70729f6b5c3f1dc71306 SHA512 9eb7cf4e1b01d7f37969bab0a66ad564da3742981ec0623b3100b0aef1bb997a80c91b88286ac673775edd197110496e1849210cc40fe310d8a478471cc1ec53
+EBUILD folding-2012.0226.1623.ebuild 428 BLAKE2B 2ff2269947afd5aa7154d6649ab7f0841e4cc8d9cbe7fca2b02ce503391e06ff64b4c771e65c8ee779dd15cb06aba44bfbeb6d8e98d855ee097ede5a0cf08d50 SHA512 024bab6af9cd050d0d2de7c073cdd4bdab352ea2334c4f4cd1d0ad71f593ede8c18d4a0dde6fee234624eb92d127bf0bb756c055a8d72f115a9f561f3a08fb28
+EBUILD folding-2013.0613.1821.ebuild 449 BLAKE2B a04b276e46658f15f653f34b1b2e410e306780427bb907e4dfdc1be1019bd34e5a5c224c993651f446738cd0bf19874b7e197553ff22cfbffa951f7fce55b69e SHA512 99fda30529093f20ae92f92f72c5c45e18b2e68315bf51a8c5b1eb78657c1e9d3131cb75a65cfa67cbba79faea24f789a598ce6e2ae00f910eeee5a2fee34817
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/folding/files/50folding-gentoo.el b/app-emacs/folding/files/50folding-gentoo.el
new file mode 100644
index 000000000000..7a741f4c2f2d
--- /dev/null
+++ b/app-emacs/folding/files/50folding-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'folding-mode "folding" "Folding mode" t)
+(autoload 'turn-off-folding-mode "folding" "Folding mode" t)
+(autoload 'turn-on-folding-mode "folding" "Folding mode" t)
diff --git a/app-emacs/folding/folding-2012.0226.1623.ebuild b/app-emacs/folding/folding-2012.0226.1623.ebuild
new file mode 100644
index 000000000000..207beefa597c
--- /dev/null
+++ b/app-emacs/folding/folding-2012.0226.1623.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A folding-editor-like Emacs minor mode"
+HOMEPAGE="https://www.emacswiki.org/emacs/FoldingMode"
+# taken from http://git.savannah.gnu.org/cgit/emacs-tiny-tools.git
+SRC_URI="mirror://gentoo/${P}.el.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/folding/folding-2013.0613.1821.ebuild b/app-emacs/folding/folding-2013.0613.1821.ebuild
new file mode 100644
index 000000000000..d2888ffe7a38
--- /dev/null
+++ b/app-emacs/folding/folding-2013.0613.1821.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A folding-editor-like Emacs minor mode"
+HOMEPAGE="https://www.emacswiki.org/emacs/FoldingMode"
+# taken from http://git.savannah.gnu.org/cgit/emacs-tiny-tools.git
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/folding/metadata.xml b/app-emacs/folding/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/folding/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/ghc-mod-5.4.0.0 b/app-emacs/ghc-mod-5.4.0.0
deleted file mode 100644
index 5e201258b009..000000000000
--- a/app-emacs/ghc-mod-5.4.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-haskell/async:=[profile?] >=dev-haskell/cabal-helper-0.6.0.0:=[profile?] <dev-haskell/cabal-helper-0.7:=[profile?] >=dev-haskell/cereal-0.4:=[profile?] dev-haskell/convertible:=[profile?] >=dev-haskell/djinn-ghc-0.0.2.2:=[profile?] >=dev-haskell/extra-1.4:2=[profile?] <dev-haskell/extra-1.5:2=[profile?] >=dev-haskell/fclabels-2.0:=[profile?] <dev-haskell/fclabels-2.1:=[profile?] dev-haskell/ghc-paths:=[profile?] dev-haskell/ghc-syb-utils:=[profile?] dev-haskell/haskell-src-exts:=[profile?] >=dev-haskell/hlint-1.8.61:=[profile?] >=dev-haskell/monad-control-1:=[profile?] >=dev-haskell/monad-journal-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/pipes-4.1:=[profile?] <dev-haskell/pipes-4.2:=[profile?] dev-haskell/random:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/temporary:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.14 test? ( >=dev-haskell/doctest-0.9.3 dev-haskell/executable-path >=dev-haskell/hspec-2.0.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Happy Haskell Programming
-EAPI=5
-HOMEPAGE=http://www.mew.org/~kazu/proj/ghc-mod/
-IUSE=emacs doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-haskell/async:=[profile?] >=dev-haskell/cabal-helper-0.6.0.0:=[profile?] <dev-haskell/cabal-helper-0.7:=[profile?] >=dev-haskell/cereal-0.4:=[profile?] dev-haskell/convertible:=[profile?] >=dev-haskell/djinn-ghc-0.0.2.2:=[profile?] >=dev-haskell/extra-1.4:2=[profile?] <dev-haskell/extra-1.5:2=[profile?] >=dev-haskell/fclabels-2.0:=[profile?] <dev-haskell/fclabels-2.1:=[profile?] dev-haskell/ghc-paths:=[profile?] dev-haskell/ghc-syb-utils:=[profile?] dev-haskell/haskell-src-exts:=[profile?] >=dev-haskell/hlint-1.8.61:=[profile?] >=dev-haskell/monad-control-1:=[profile?] >=dev-haskell/monad-journal-0.4:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/pipes-4.1:=[profile?] <dev-haskell/pipes-4.2:=[profile?] dev-haskell/random:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/temporary:=[profile?] dev-haskell/text:=[profile?] dev-haskell/transformers:=[profile?] dev-haskell/transformers-base:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/5.4.0.0
-SRC_URI=mirror://hackage/packages/archive/ghc-mod/5.4.0.0/ghc-mod-5.4.0.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ghc-package a0d34e2f5f204f01c404ae1ce539542a haskell-cabal 45605f3898bdc59eb016fb50ca27bf18 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=03d2b45fb718d37bb14081031e6ac2c8
diff --git a/app-emacs/ghc-mod-5.5.0.0-r1 b/app-emacs/ghc-mod-5.5.0.0-r1
deleted file mode 100644
index 407ac449c87a..000000000000
--- a/app-emacs/ghc-mod-5.5.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/binary-0.5.1.0:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/cabal-helper-0.6.3.0:=[profile?] <dev-haskell/cabal-helper-0.7:=[profile?] dev-haskell/convertible:=[profile?] >=dev-haskell/djinn-ghc-0.0.2.2:=[profile?] <dev-haskell/djinn-ghc-0.1:=[profile?] >=dev-haskell/extra-1.4:2=[profile?] <dev-haskell/extra-1.5:2=[profile?] >=dev-haskell/fclabels-2.0:=[profile?] <dev-haskell/fclabels-2.1:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] <dev-haskell/ghc-syb-utils-0.3:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] >=dev-haskell/hlint-1.8.61:=[profile?] <dev-haskell/hlint-1.10:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-journal-0.4:=[profile?] <dev-haskell/monad-journal-0.8:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/optparse-applicative-0.11.0:=[profile?] <dev-haskell/optparse-applicative-0.13.0:=[profile?] >=dev-haskell/pipes-4.1:=[profile?] <dev-haskell/pipes-4.2:=[profile?] >=dev-haskell/safe-0.3.9:=[profile?] <dev-haskell/safe-0.4:=[profile?] <dev-haskell/split-0.3:=[profile?] <dev-haskell/syb-0.7:=[profile?] <dev-haskell/temporary-1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.14 test? ( >=dev-haskell/doctest-0.9.3 dev-haskell/executable-path >=dev-haskell/hspec-2.0.0 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Happy Haskell Programming
-EAPI=5
-HOMEPAGE=http://www.mew.org/~kazu/proj/ghc-mod/
-IUSE=emacs doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=>=dev-haskell/binary-0.5.1.0:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/cabal-helper-0.6.3.0:=[profile?] <dev-haskell/cabal-helper-0.7:=[profile?] dev-haskell/convertible:=[profile?] >=dev-haskell/djinn-ghc-0.0.2.2:=[profile?] <dev-haskell/djinn-ghc-0.1:=[profile?] >=dev-haskell/extra-1.4:2=[profile?] <dev-haskell/extra-1.5:2=[profile?] >=dev-haskell/fclabels-2.0:=[profile?] <dev-haskell/fclabels-2.1:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] <dev-haskell/ghc-syb-utils-0.3:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?] >=dev-haskell/hlint-1.8.61:=[profile?] <dev-haskell/hlint-1.10:=[profile?] >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-journal-0.4:=[profile?] <dev-haskell/monad-journal-0.8:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/optparse-applicative-0.11.0:=[profile?] <dev-haskell/optparse-applicative-0.13.0:=[profile?] >=dev-haskell/pipes-4.1:=[profile?] <dev-haskell/pipes-4.2:=[profile?] >=dev-haskell/safe-0.3.9:=[profile?] <dev-haskell/safe-0.4:=[profile?] <dev-haskell/split-0.3:=[profile?] <dev-haskell/syb-0.7:=[profile?] <dev-haskell/temporary-1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.4.1:=
-RESTRICT=test
-SLOT=0/5.5.0.0
-SRC_URI=mirror://hackage/packages/archive/ghc-mod/5.5.0.0/ghc-mod-5.5.0.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ghc-package a0d34e2f5f204f01c404ae1ce539542a haskell-cabal 45605f3898bdc59eb016fb50ca27bf18 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9ff4f2acd3ec65717346b649d64db1ed
diff --git a/app-emacs/ghc-mod-5.7.0.0 b/app-emacs/ghc-mod-5.7.0.0
deleted file mode 100644
index 5759ca32ca3b..000000000000
--- a/app-emacs/ghc-mod-5.7.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/cabal-helper-0.7.3.0:=[profile?] <dev-haskell/cabal-helper-0.8:=[profile?] >=dev-haskell/djinn-ghc-0.0.2.2:=[profile?] <dev-haskell/djinn-ghc-0.1:=[profile?] >=dev-haskell/extra-1.4.0:=[profile?] <dev-haskell/extra-1.6:=[profile?] >=dev-haskell/fclabels-2.0:=[profile?] <dev-haskell/fclabels-2.1:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] >=dev-haskell/ghc-syb-utils-0.2.3:=[profile?] <dev-haskell/ghc-syb-utils-0.3:=[profile?] >=dev-haskell/haskell-src-exts-1.16.0.1:=[profile?] <dev-haskell/haskell-src-exts-1.19:=[profile?] >=dev-haskell/hlint-1.9.27:=[profile?] <dev-haskell/hlint-1.10:=[profile?] >=dev-haskell/monad-control-1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-journal-0.4:=[profile?] <dev-haskell/monad-journal-0.8:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/optparse-applicative-0.11.0:=[profile?] <dev-haskell/optparse-applicative-0.14.0:=[profile?] >=dev-haskell/pipes-4.1.0:=[profile?] <dev-haskell/pipes-4.4:=[profile?] >=dev-haskell/safe-0.3.9:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/semigroups-0.10.0:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/split-0.2.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/syb-0.5.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-haskell/temporary-1.2.0.3:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.8.2:= >=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-1.25 test? ( >=dev-haskell/doctest-0.9.3 <dev-haskell/doctest-0.12 >=dev-haskell/hspec-2.0.0 <dev-haskell/hspec-2.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Happy Haskell Programming
-EAPI=6
-HOMEPAGE=http://www.mew.org/~kazu/proj/ghc-mod/
-IUSE=emacs doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=>=dev-haskell/cabal-helper-0.7.3.0:=[profile?] <dev-haskell/cabal-helper-0.8:=[profile?] >=dev-haskell/djinn-ghc-0.0.2.2:=[profile?] <dev-haskell/djinn-ghc-0.1:=[profile?] >=dev-haskell/extra-1.4.0:=[profile?] <dev-haskell/extra-1.6:=[profile?] >=dev-haskell/fclabels-2.0:=[profile?] <dev-haskell/fclabels-2.1:=[profile?] >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?] >=dev-haskell/ghc-syb-utils-0.2.3:=[profile?] <dev-haskell/ghc-syb-utils-0.3:=[profile?] >=dev-haskell/haskell-src-exts-1.16.0.1:=[profile?] <dev-haskell/haskell-src-exts-1.19:=[profile?] >=dev-haskell/hlint-1.9.27:=[profile?] <dev-haskell/hlint-1.10:=[profile?] >=dev-haskell/monad-control-1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?] >=dev-haskell/monad-journal-0.4:=[profile?] <dev-haskell/monad-journal-0.8:=[profile?] >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/optparse-applicative-0.11.0:=[profile?] <dev-haskell/optparse-applicative-0.14.0:=[profile?] >=dev-haskell/pipes-4.1.0:=[profile?] <dev-haskell/pipes-4.4:=[profile?] >=dev-haskell/safe-0.3.9:=[profile?] <dev-haskell/safe-0.4:=[profile?] >=dev-haskell/semigroups-0.10.0:=[profile?] <dev-haskell/semigroups-0.19:=[profile?] >=dev-haskell/split-0.2.2:=[profile?] <dev-haskell/split-0.3:=[profile?] >=dev-haskell/syb-0.5.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-haskell/temporary-1.2.0.3:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?] >=dev-lang/ghc-7.8.2:=
-RESTRICT=test
-SLOT=0/5.7.0.0
-SRC_URI=mirror://hackage/packages/archive/ghc-mod/5.7.0.0/ghc-mod-5.7.0.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ghc-package a0d34e2f5f204f01c404ae1ce539542a haskell-cabal 45605f3898bdc59eb016fb50ca27bf18 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a507fdd654b6494292874f3c1717818f
diff --git a/app-emacs/ghc-mod/Manifest b/app-emacs/ghc-mod/Manifest
new file mode 100644
index 000000000000..95835b2cd617
--- /dev/null
+++ b/app-emacs/ghc-mod/Manifest
@@ -0,0 +1,9 @@
+AUX 50ghc-mod-gentoo.el 75 BLAKE2B 8b6c9f3d2a9d3d69700cbdf36a58a3bf07913e7a6369d9a53d39296fd31e2594564fdc20e123093908448acfed9d4d242fed4e93660a6a753ff9b551e6aeeaf0 SHA512 483a8d3e464aa4c3252b38bca4b9291a94080c04407df8f7c8ac110e14eb539c6795ae70ed3d6c217db39fd29a6be7c08b8bc295ef1fd2cd1d2aa7efeba7d0f4
+AUX ghc-mod-5.6.0.0-gentoo.patch 134 BLAKE2B 51f5561d87628191bc070c3f4ce57d19bc0c784df483a24e1e90546014e1b74878514c13049f13efe12c81b59f2311ab1567970a1c792c316de7b44ed8f269a3 SHA512 34fda23f27d1ba0ccad898e9b6d5bbd2f3e2d235e692e910a76c35c894985d0453219b7ab53c4dacb8d3b88f7aea79f5badf92ad8eee90b764e7c1e009135e56
+DIST ghc-mod-5.4.0.0.tar.gz 132546 BLAKE2B 6670df6b271527ee2a69c74b0522b94e78e799b62d260ca744a382312c815e904d516345c6258be0d9aa82f91866126b95cc4682bc1925616078ffef1a559905 SHA512 fabcc5ce2fb9e8790043faae2d42b3714fab96da1409d7f1c4736f332c6b74c76724dce253456fd787526d125cfaa1fe48c4725a0da16aabb35d5edf560f2415
+DIST ghc-mod-5.5.0.0.tar.gz 150774 BLAKE2B 87d2be174200f05da0f38a2947c4404c0b25ce77a03d3b456f8cde769e978bbe6fad6e2c04d1af61e05d61fb941c139c297baaeb4835c02390516a88bebbf539 SHA512 006f292394fc24766a2ae2c778635697a63e1b48ef96052af66dc35d1ef30eb600760cd2a517011a7a2b027a0c725ceb3b5e37cfe157741ba97f19068f1264e8
+DIST ghc-mod-5.7.0.0.tar.gz 146797 BLAKE2B b5d684dbb505001bfc061473cd62d00491bfe8ca5710cb69c72cb2544838a9a3b7d88d414be8123f9edf82cf96773f49439912a98efec843c167334d31caeaf8 SHA512 843cd0546c0a0cdf30dd9cde5e9148dabf391648bae6d7f2852c83a4cd5b8329f30d0cc578ba6afda02e8885b2ed63c7def4885e0dbaac199d311e476a0cc6e3
+EBUILD ghc-mod-5.4.0.0.ebuild 2605 BLAKE2B ae293eb8f1417d88a0659a5d4b2d4899c6f697f42e8090dfc34f69b7f1ee9056c0e58101f5367fa8b0877ef6833e89f4d81bdc7389901661083d647b1afc1ea4 SHA512 7432db717423e013f51521d7faea351f4138d0215f8ff80e0891d996a28ae3991bfd183c7929f09e324d00b490719e383b6434f592ef565125e1a1dbe32e0a8d
+EBUILD ghc-mod-5.5.0.0-r1.ebuild 3063 BLAKE2B 0982900342cfad1ebdd568ca17be7a624eb3881b98e762575aa1f88088d59830dad99e025feea0172801c72bf41b883644f02b56861e2edf478cccad85b52319 SHA512 a2e922544860a0de09a9fae0e37fa4ef2b6627478e8c085c9f5287f24bf943c95a00f390fefd97a4f9e50f21da58e38b8b3f9960e36c81031cde70670bf95278
+EBUILD ghc-mod-5.7.0.0.ebuild 3372 BLAKE2B b628625dae8816f22c811cf6c6fab880ce3f1721aca59fcf886a1f4d03875a4663f8b39042e16fca39947b031789453d0c4f18abd5884239db57d28a630ec704 SHA512 071a98379192e9470d9e10de2aec2f6737545de1553d888bdded5bdf125dcd5d66c3eb1ee390cbb6b24618dfb788c52a63c8e3610d2ded2a049c5d446697ac08
+MISC metadata.xml 726 BLAKE2B b31275f576fce5947f0ead75fa4433f170ebab7e8d12ab8365f544d4be4f923829940fdfad6095a2c02da7865a442baba76c5a169b4593eb65b3f76033329015 SHA512 7249be2424dad8767b67a275fcbd81c3435e4c7b274cef3c0ee0c64cc379877506420d2fad335d2f59f3c25c8c5e2ee9719a12581826b141a0df97556d33bc9e
diff --git a/app-emacs/ghc-mod/files/50ghc-mod-gentoo.el b/app-emacs/ghc-mod/files/50ghc-mod-gentoo.el
new file mode 100644
index 000000000000..402c84de9b12
--- /dev/null
+++ b/app-emacs/ghc-mod/files/50ghc-mod-gentoo.el
@@ -0,0 +1,3 @@
+;;; ghc-mod site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch b/app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch
new file mode 100644
index 000000000000..f7e6e1c4c654
--- /dev/null
+++ b/app-emacs/ghc-mod/files/ghc-mod-5.6.0.0-gentoo.patch
@@ -0,0 +1,5 @@
+--- a/ghc-mod.cabal
++++ b/ghc-mod.cabal
+@@ -29,2 +29,0 @@
+-Data-Files: elisp/Makefile
+- elisp/*.el
diff --git a/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild b/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
new file mode 100644
index 000000000000..3c52fd7d1b66
--- /dev/null
+++ b/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit elisp-common haskell-cabal
+
+DESCRIPTION="Happy Haskell Programming"
+HOMEPAGE="http://www.mew.org/~kazu/proj/ghc-mod/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs"
+
+RESTRICT=test # doctests break on modules collisions: temporary / temporary-rc
+
+RDEPEND="dev-haskell/async:=[profile?]
+ >=dev-haskell/cabal-helper-0.6.0.0:=[profile?] <dev-haskell/cabal-helper-0.7:=[profile?]
+ >=dev-haskell/cereal-0.4:=[profile?]
+ dev-haskell/convertible:=[profile?]
+ >=dev-haskell/djinn-ghc-0.0.2.2:=[profile?]
+ >=dev-haskell/extra-1.4:2=[profile?] <dev-haskell/extra-1.5:2=[profile?]
+ >=dev-haskell/fclabels-2.0:=[profile?] <dev-haskell/fclabels-2.1:=[profile?]
+ dev-haskell/ghc-paths:=[profile?]
+ dev-haskell/ghc-syb-utils:=[profile?]
+ dev-haskell/haskell-src-exts:=[profile?]
+ >=dev-haskell/hlint-1.8.61:=[profile?]
+ >=dev-haskell/monad-control-1:=[profile?]
+ >=dev-haskell/monad-journal-0.4:=[profile?]
+ >=dev-haskell/mtl-2.0:=[profile?]
+ dev-haskell/old-time:=[profile?]
+ >=dev-haskell/pipes-4.1:=[profile?] <dev-haskell/pipes-4.2:=[profile?]
+ dev-haskell/random:=[profile?]
+ dev-haskell/split:=[profile?]
+ dev-haskell/syb:=[profile?]
+ dev-haskell/temporary:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/transformers:=[profile?]
+ dev-haskell/transformers-base:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.14
+ test? ( >=dev-haskell/doctest-0.9.3
+ dev-haskell/executable-path
+ >=dev-haskell/hspec-2.0.0 )
+"
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-5.6.0.0-gentoo.patch
+}
+
+src_compile() {
+ haskell-cabal_src_compile
+ if use emacs ; then
+ pushd elisp
+ elisp-compile *.el || die
+ popd
+ fi
+}
+
+src_install() {
+ haskell-cabal_src_install
+ if use emacs ; then
+ pushd "${S}"
+ elisp-install ghc-mod elisp/*.{el,elc}
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ popd
+ fi
+}
+
+pkg_postinst() {
+ if use emacs ; then
+ elisp-site-regen
+ elog "To configure ghc-mod either add this line to ~/.emacs:"
+ elog "(autoload 'ghc-init \"ghc\" nil t)"
+ elog "and either this line:"
+ elog "(add-hook 'haskell-mode-hook (lambda () (ghc-init)))"
+ elog "or if you wish to use flymake:"
+ elog "(add-hook 'haskell-mode-hook (lambda () (ghc-init) (flymake-mode)))"
+ fi
+}
+
+pkg_postrm() {
+ if use emacs ; then
+ elisp-site-regen
+ fi
+}
diff --git a/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild b/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild
new file mode 100644
index 000000000000..82d7ae03eec4
--- /dev/null
+++ b/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit elisp-common haskell-cabal
+
+DESCRIPTION="Happy Haskell Programming"
+HOMEPAGE="http://www.mew.org/~kazu/proj/ghc-mod/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs"
+
+RESTRICT=test # doctests break on modules collisions: temporary / temporary-rc
+
+RDEPEND=">=dev-haskell/binary-0.5.1.0:=[profile?] <dev-haskell/binary-0.8:=[profile?]
+ >=dev-haskell/cabal-helper-0.6.3.0:=[profile?] <dev-haskell/cabal-helper-0.7:=[profile?]
+ dev-haskell/convertible:=[profile?]
+ >=dev-haskell/djinn-ghc-0.0.2.2:=[profile?] <dev-haskell/djinn-ghc-0.1:=[profile?]
+ >=dev-haskell/extra-1.4:2=[profile?] <dev-haskell/extra-1.5:2=[profile?]
+ >=dev-haskell/fclabels-2.0:=[profile?] <dev-haskell/fclabels-2.1:=[profile?]
+ <dev-haskell/ghc-paths-0.2:=[profile?]
+ <dev-haskell/ghc-syb-utils-0.3:=[profile?]
+ <dev-haskell/haskell-src-exts-1.18:=[profile?]
+ >=dev-haskell/hlint-1.8.61:=[profile?] <dev-haskell/hlint-1.10:=[profile?]
+ >=dev-haskell/monad-control-1.0:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+ >=dev-haskell/monad-journal-0.4:=[profile?] <dev-haskell/monad-journal-0.8:=[profile?]
+ >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+ <dev-haskell/old-time-1.2:=[profile?]
+ >=dev-haskell/optparse-applicative-0.11.0:=[profile?] <dev-haskell/optparse-applicative-0.13.0:=[profile?]
+ >=dev-haskell/pipes-4.1:=[profile?] <dev-haskell/pipes-4.2:=[profile?]
+ >=dev-haskell/safe-0.3.9:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+ <dev-haskell/split-0.3:=[profile?]
+ <dev-haskell/syb-0.7:=[profile?]
+ <dev-haskell/temporary-1.3:=[profile?]
+ <dev-haskell/text-1.3:=[profile?]
+ <dev-haskell/transformers-0.5:=[profile?]
+ <dev-haskell/transformers-base-0.5:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.14
+ test? ( >=dev-haskell/doctest-0.9.3
+ dev-haskell/executable-path
+ >=dev-haskell/hspec-2.0.0 )
+"
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-5.6.0.0-gentoo.patch
+}
+
+src_compile() {
+ haskell-cabal_src_compile
+ if use emacs ; then
+ pushd elisp
+ elisp-compile *.el || die
+ popd
+ fi
+}
+
+src_install() {
+ haskell-cabal_src_install
+ if use emacs ; then
+ pushd "${S}"
+ elisp-install ghc-mod elisp/*.{el,elc}
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ popd
+ fi
+}
+
+pkg_postinst() {
+ haskell-cabal_pkg_postinst
+ if use emacs ; then
+ elisp-site-regen
+ elog "To configure ghc-mod either add this line to ~/.emacs:"
+ elog "(autoload 'ghc-init \"ghc\" nil t)"
+ elog "and either this line:"
+ elog "(add-hook 'haskell-mode-hook (lambda () (ghc-init)))"
+ elog "or if you wish to use flymake:"
+ elog "(add-hook 'haskell-mode-hook (lambda () (ghc-init) (flymake-mode)))"
+ fi
+}
+
+pkg_postrm() {
+ haskell-cabal_pkg_postrm
+ if use emacs ; then
+ elisp-site-regen
+ fi
+}
diff --git a/app-emacs/ghc-mod/ghc-mod-5.7.0.0.ebuild b/app-emacs/ghc-mod/ghc-mod-5.7.0.0.ebuild
new file mode 100644
index 000000000000..5820ecede9f8
--- /dev/null
+++ b/app-emacs/ghc-mod/ghc-mod-5.7.0.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit elisp-common haskell-cabal
+
+DESCRIPTION="Happy Haskell Programming"
+HOMEPAGE="http://www.mew.org/~kazu/proj/ghc-mod/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs"
+
+RESTRICT=test # doctests break on modules collisions: temporary / temporary-rc
+
+RDEPEND=">=dev-haskell/cabal-helper-0.7.3.0:=[profile?] <dev-haskell/cabal-helper-0.8:=[profile?]
+ >=dev-haskell/djinn-ghc-0.0.2.2:=[profile?] <dev-haskell/djinn-ghc-0.1:=[profile?]
+ >=dev-haskell/extra-1.4.0:=[profile?] <dev-haskell/extra-1.6:=[profile?]
+ >=dev-haskell/fclabels-2.0:=[profile?] <dev-haskell/fclabels-2.1:=[profile?]
+ >=dev-haskell/ghc-paths-0.1.0.9:=[profile?] <dev-haskell/ghc-paths-0.2:=[profile?]
+ >=dev-haskell/ghc-syb-utils-0.2.3:=[profile?] <dev-haskell/ghc-syb-utils-0.3:=[profile?]
+ >=dev-haskell/haskell-src-exts-1.16.0.1:=[profile?] <dev-haskell/haskell-src-exts-1.19:=[profile?]
+ >=dev-haskell/hlint-1.9.27:=[profile?] <dev-haskell/hlint-1.10:=[profile?]
+ >=dev-haskell/monad-control-1:=[profile?] <dev-haskell/monad-control-1.1:=[profile?]
+ >=dev-haskell/monad-journal-0.4:=[profile?] <dev-haskell/monad-journal-0.8:=[profile?]
+ >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+ <dev-haskell/old-time-1.2:=[profile?]
+ >=dev-haskell/optparse-applicative-0.11.0:=[profile?] <dev-haskell/optparse-applicative-0.14.0:=[profile?]
+ >=dev-haskell/pipes-4.1.0:=[profile?] <dev-haskell/pipes-4.4:=[profile?]
+ >=dev-haskell/safe-0.3.9:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+ >=dev-haskell/semigroups-0.10.0:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+ >=dev-haskell/split-0.2.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
+ >=dev-haskell/syb-0.5.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
+ >=dev-haskell/temporary-1.2.0.3:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
+ >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+ >=dev-haskell/transformers-base-0.4.4:=[profile?] <dev-haskell/transformers-base-0.5:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-1.25
+ test? ( >=dev-haskell/doctest-0.9.3 <dev-haskell/doctest-0.12
+ >=dev-haskell/hspec-2.0.0 <dev-haskell/hspec-2.4 )
+"
+SITEFILE=50${PN}-gentoo.el
+
+PATCHES=("${FILESDIR}"/${PN}-5.6.0.0-gentoo.patch)
+
+src_compile() {
+ haskell-cabal_src_compile
+ if use emacs ; then
+ pushd elisp
+ elisp-compile *.el || die
+ popd
+ fi
+}
+
+src_install() {
+ haskell-cabal_src_install
+ if use emacs ; then
+ pushd "${S}"
+ elisp-install ghc-mod elisp/*.{el,elc}
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ popd
+ fi
+}
+
+pkg_postinst() {
+ haskell-cabal_pkg_postinst
+ if use emacs ; then
+ elisp-site-regen
+ elog "To configure ghc-mod either add this line to ~/.emacs:"
+ elog "(autoload 'ghc-init \"ghc\" nil t)"
+ elog "and either this line:"
+ elog "(add-hook 'haskell-mode-hook (lambda () (ghc-init)))"
+ elog "or if you wish to use flymake:"
+ elog "(add-hook 'haskell-mode-hook (lambda () (ghc-init) (flymake-mode)))"
+ fi
+}
+
+pkg_postrm() {
+ haskell-cabal_pkg_postrm
+ if use emacs ; then
+ elisp-site-regen
+ fi
+}
diff --git a/app-emacs/ghc-mod/metadata.xml b/app-emacs/ghc-mod/metadata.xml
new file mode 100644
index 000000000000..fc177fe2f9ad
--- /dev/null
+++ b/app-emacs/ghc-mod/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+</maintainer>
+<longdescription>
+ This packages includes Elisp files and a Haskell command, "ghc-mod".
+ "ghc*.el" enable completion of Haskell symbols on Emacs. Flymake is
+ also integrated. "ghc-mod" is a backend of "ghc*.el". It lists up
+ all installed modules or extracts names of functions, classes, and
+ data declarations.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/ghub-2.0.0 b/app-emacs/ghub-2.0.0
deleted file mode 100644
index f421f0f118df..000000000000
--- a/app-emacs/ghub-2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-25
-DESCRIPTION=minuscule client library for the Github API
-EAPI=6
-HOMEPAGE=https://magit.vc/manual/ghub
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-25
-SLOT=0
-SRC_URI=https://github.com/magit/ghub/archive/v2.0.0.tar.gz -> ghub-2.0.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=8568f9c9a6a1f2b8b96039ccbe68f290
diff --git a/app-emacs/ghub-2.0.1 b/app-emacs/ghub-2.0.1
deleted file mode 100644
index 2d3b486526ad..000000000000
--- a/app-emacs/ghub-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-25
-DESCRIPTION=minuscule client library for the Github API
-EAPI=6
-HOMEPAGE=https://magit.vc/manual/ghub
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-25
-SLOT=0
-SRC_URI=https://github.com/magit/ghub/archive/v2.0.1.tar.gz -> ghub-2.0.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=d53bc004abc36a0290c26b04c1e2d0a8
diff --git a/app-emacs/ghub/Manifest b/app-emacs/ghub/Manifest
new file mode 100644
index 000000000000..36aa091c0d0d
--- /dev/null
+++ b/app-emacs/ghub/Manifest
@@ -0,0 +1,6 @@
+AUX 50ghub-gentoo.el 124 BLAKE2B 84170098bd01bb9f165eaf06f7cb21c56d2caaf964d2658520311757845d053072a7704fcb90cce2a2dfbd2385f357d2e7569061ebe0ca41b575efd752d29fd8 SHA512 596c7e75560f3734b57525bdfb42f3985fb49ab4d86637231361f6673d2431c0a6e73f91f58f003f9027f1143b9be3f4330ef2e1ff6c627ca6057256f4afbfca
+DIST ghub-2.0.0.tar.gz 48150 BLAKE2B b9142f33f92dc08a1d5f3f3467361866b41d0d2c943465e803987a41a7bbba1bc4c7e30c058e6e3899110a57d3e1d49545df01efbceb67711186e6411ebc9a58 SHA512 39e1ac1760e1a8532ee5d6fd29386ccc24d7f0278f6c900d565a709f86ac6acf01ae49a3462b54054d5b0040102db82ea048157a12663c46b0c45fe11f2e86d6
+DIST ghub-2.0.1.tar.gz 50014 BLAKE2B 449c12b4a75b8de75249fa8f3fd624551d36ae745325fe62b20d8a68a6bad565a308e8c9be6d742c24fff5238fe2cd56fda9d8353465dec28e0f42b2ee10dc77 SHA512 d27b3f150b1b871dd31746ee7396b7bea544a6209f73039fa0ac6b670e3fcdbddc2f888cfa3dfe89b64325d208f5fe18ad90869e012758dea54878d0dcc82528
+EBUILD ghub-2.0.0.ebuild 489 BLAKE2B e3889ff149dc2f09ba8af3e685fa91d32afb9b3522e4efab84cd8bca82258818a2fb2c322c796c719fcd5020d47f0df327917fe7c10bc887c0ccb55eee999f4b SHA512 a97f25b7c8eb7be16b10494ad540db5f4337cb5cb86527eb90993fe4daf41e12ea4013591b159415d1d117b1652bcaf0e11e8dc00d54ec16ea678a8c01b79146
+EBUILD ghub-2.0.1.ebuild 491 BLAKE2B 05a95bdb2094248383afa5eaa75d681dbac6e8c2f4e553a75cce9f6e66506e3db60332fe53071566ee3d709852c05b02d91f542568ff6f7043bf980df8de7250 SHA512 d46a2d66289098737c75d393a42cd1e22a0d4741e5c223a310a41d1159f0a6ff0d88c15e88144682703dd65e46942a28039f35e41f3a247b8d40b4bfaf0bba5e
+MISC metadata.xml 1296 BLAKE2B b58f88e8262157cef344eb119a5f3c265105c1f90ccfd40192a197b19ab911e086f00e259e2de5f14d8f02918e5e5516568cd95c4a0a2719dd3c7a235c52d38a SHA512 8e9fc9e9112bbc0d069978583e625909c12e3ea03d747fa3189c34ec35113d1d688fee50d0c0983c0eaef5eb884947132b5317d11b89c8f994efec4fef5abe33
diff --git a/app-emacs/ghub/files/50ghub-gentoo.el b/app-emacs/ghub/files/50ghub-gentoo.el
new file mode 100644
index 000000000000..37d6696a3da1
--- /dev/null
+++ b/app-emacs/ghub/files/50ghub-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'ghub-create-token "ghub" nil t)
+(autoload 'ghub-token-scopes "ghub" nil t)
diff --git a/app-emacs/ghub/ghub-2.0.0.ebuild b/app-emacs/ghub/ghub-2.0.0.ebuild
new file mode 100644
index 000000000000..b81e58b6400b
--- /dev/null
+++ b/app-emacs/ghub/ghub-2.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=25
+
+inherit elisp
+
+DESCRIPTION="minuscule client library for the Github API"
+HOMEPAGE="https://magit.vc/manual/ghub"
+SRC_URI="https://github.com/magit/ghub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md"
+
+DEPEND="sys-apps/texinfo"
diff --git a/app-emacs/ghub/ghub-2.0.1.ebuild b/app-emacs/ghub/ghub-2.0.1.ebuild
new file mode 100644
index 000000000000..e5be353be611
--- /dev/null
+++ b/app-emacs/ghub/ghub-2.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=25
+
+inherit elisp
+
+DESCRIPTION="minuscule client library for the Github API"
+HOMEPAGE="https://magit.vc/manual/ghub"
+SRC_URI="https://github.com/magit/ghub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md"
+
+DEPEND="sys-apps/texinfo"
diff --git a/app-emacs/ghub/metadata.xml b/app-emacs/ghub/metadata.xml
new file mode 100644
index 000000000000..e109fb943fc8
--- /dev/null
+++ b/app-emacs/ghub/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+Ghub is a library that provides basic support for using the Github API
+from Emacs packages. It abstracts access to API resources using only
+a handful of functions that are not resource-specific.
+
+Ghub handles the creation, storage and use of access tokens using a
+setup wizard to make it easier for users to get started and to reduce
+the support burden imposed on package maintainers. It also comes with
+a comprehensive manual to address the cases when things don't just
+work as expected or in case you don't want to use the wizard.
+
+Ghub is intentionally limited to only provide these two essential
+features basic request functions and guided setup to avoid being
+too opinionated, which would hinder wide adoption. It is assumed that
+wide adoption would make life easier for users and maintainers alike,
+because then all packages that talk to the Github API could be
+configured the same way.
+</longdescription>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">magit/ghub</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/gnuplot-mode-0.7.0 b/app-emacs/gnuplot-mode-0.7.0
deleted file mode 100644
index 3f2db5f189f1..000000000000
--- a/app-emacs/gnuplot-mode-0.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=doc? ( virtual/latex-base ) >=virtual/emacs-23
-DESCRIPTION=Gnuplot mode for Emacs
-EAPI=5
-HOMEPAGE=http://xafs.org/BruceRavel/GnuplotMode
-IUSE=doc
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=sci-visualization/gnuplot[-emacs(-)] >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/bruceravel/gnuplot-mode/archive/0.7.0.tar.gz -> gnuplot-mode-0.7.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2190ff50741af619a6fb4892a293dd93
diff --git a/app-emacs/gnuplot-mode/Manifest b/app-emacs/gnuplot-mode/Manifest
new file mode 100644
index 000000000000..ebb3287ec64c
--- /dev/null
+++ b/app-emacs/gnuplot-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50gnuplot-mode-gentoo.el 347 BLAKE2B 6a72d3ac75c8ef7629b8c018f9652b924137f56feb7c1578d7d5b572846bb22b248ae569412e7d9f6969ce6daca4aa21debccac7b7d5b63c4c66b04959d72836 SHA512 eb342c60bee1a9e45a50373093207545b8b37888432b082afb7c4f0911eed08481379094ee5a73888a03a12898c3c41016c2d9161f92a1a7cf7be7f2010c1c83
+DIST gnuplot-mode-0.7.0.tar.gz 373475 BLAKE2B 6aa547b90922fa445de10825ae8f0c05249a335a1cc531118200bc49c4b62f610e07a7c5bd694a3c6bf6605b937a520a8008d67263d2e83cabf009fb855e7a97 SHA512 fdf04a3a32755892d422de8a535682ff44d1b635ecdc814738564376f5c7027a82c23807439835f2b7bf959f4f8b7a7d38d07a643f84ab2056ba187f3558e596
+EBUILD gnuplot-mode-0.7.0.ebuild 1002 BLAKE2B b6d2dc95275398ff12d94400fa30ad5b1a41757485bbad24c1b18b41ae94051af18b2e3d99c3905cb9d67feb115b3fa04a2bef57e37d1e8e35637d120f91c0ac SHA512 37f0ceae8aa23dac56e0064baf6498c1e0aee61ace0469f80d71051dc8a110a2e6c99796f71456ab18f2aeed030f783cc0e29434a4478e6fadf959768d5cd9a4
+MISC metadata.xml 368 BLAKE2B b1313c69a215b2231db94ed717741bcc3a771b183736a92c8fc81494eeb50fd634572c1dfa550acee7b182f6e587d0fa401738b8bf40403ae92ae37468f24fd5 SHA512 631de1c715d46e3ec59a3e973a508ac4686749f2d2929ec50a17f53c4f7f0615b08a539ea84ca88eb541bd2217817fd47c4941a97a25ac6a2b132ee776041191
diff --git a/app-emacs/gnuplot-mode/files/50gnuplot-mode-gentoo.el b/app-emacs/gnuplot-mode/files/50gnuplot-mode-gentoo.el
new file mode 100644
index 000000000000..e79a7f0d2585
--- /dev/null
+++ b/app-emacs/gnuplot-mode/files/50gnuplot-mode-gentoo.el
@@ -0,0 +1,6 @@
+(add-to-list 'load-path "@SITELISP@")
+;; extracted from dotemacs file distributed with the source tarball
+(autoload 'gnuplot-mode "gnuplot" "gnuplot major mode" t)
+(autoload 'gnuplot-make-buffer "gnuplot" "open a buffer in gnuplot mode" t)
+(add-to-list 'auto-mode-alist '("\\.gp\\'" . gnuplot-mode))
+;;(global-set-key [(f9)] 'gnuplot-make-buffer)
diff --git a/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild b/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild
new file mode 100644
index 000000000000..1a90fa983b9a
--- /dev/null
+++ b/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+DESCRIPTION="Gnuplot mode for Emacs"
+HOMEPAGE="http://xafs.org/BruceRavel/GnuplotMode"
+SRC_URI="https://github.com/bruceravel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc"
+
+DEPEND="doc? ( virtual/latex-base )"
+RDEPEND="sci-visualization/gnuplot[-emacs(-)]"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+ econf \
+ EMACS="${EMACS}" \
+ --with-lispdir="${EPREFIX}${SITELISP}/${PN}"
+}
+
+src_compile() {
+ emake
+ use doc && emake pdf
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ dodoc README.org
+ use doc && dodoc gpelcard.pdf
+
+ DOC_CONTENTS="Please see ${SITELISP}/${PN}/gnuplot.el for the
+ complete documentation."
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/gnuplot-mode/metadata.xml b/app-emacs/gnuplot-mode/metadata.xml
new file mode 100644
index 000000000000..c3270eb3ebef
--- /dev/null
+++ b/app-emacs/gnuplot-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">bruceravel/gnuplot-mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/gnuserv-3.12.8-r3 b/app-emacs/gnuserv-3.12.8-r3
deleted file mode 100644
index aae518857758..000000000000
--- a/app-emacs/gnuserv-3.12.8-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-eselect/eselect-emacs-1.15 X? ( x11-libs/libXau ) X? ( x11-base/xorg-proto ) >=virtual/emacs-23
-DESCRIPTION=Attach to an already running Emacs
-EAPI=6
-HOMEPAGE=http://meltin.net/hacks/emacs/
-IUSE=X
-KEYWORDS=amd64 ~ppc x86 ~x86-linux ~ppc-macos
-LICENSE=GPL-2+
-RDEPEND=>=app-eselect/eselect-emacs-1.15 X? ( x11-libs/libXau ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://meltin.net/hacks/emacs/src/gnuserv-3.12.8.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=985c681c2f88e21cdf6439a608175349
diff --git a/app-emacs/gnuserv/Manifest b/app-emacs/gnuserv/Manifest
new file mode 100644
index 000000000000..b25dd89a82a0
--- /dev/null
+++ b/app-emacs/gnuserv/Manifest
@@ -0,0 +1,5 @@
+AUX 50gnuserv-gentoo.el 237 BLAKE2B 53e2fb102e832b852ebd23d3a7cda10a1cde7e1733818dd357edaa0ba67e66d925ea589195dd5b797ba37e62f44e26706669594f875409fb6afb294bba05d549 SHA512 24edf596178da29d68add510382241bf257ccb6ed0f9bd1aa65a2bda268b2fa506be616f70c75628d82cc8fda06617f5a4b58e602a9dc082476ac4ad4f0e047d
+AUX gnuclient.desktop 608 BLAKE2B b50695688d76ec34dae2fb68b4865769ab531a2a5add76a48c71eac6542ea3736f6e2239f1b05775e88bee3bc2ccfc6e50bc0c49a6eacbb277d822bb2cfb3003 SHA512 35616b5fe182f4127635454f4af89b307c0c52653878ef163efee4741c4b5fe5ab88d78f89ebfe499cc02516d2a7093c49dc2232a2768e952acd61651ff16468
+DIST gnuserv-3.12.8.tar.gz 124070 BLAKE2B 7531d85f6cd1873f75499c37230907f96ac484e1d58a4a3459f44d3bfaa6a6124d44f99a7c27d1fa3deb16b1cc29d08313b911cdc1782a1c5b24bd702ef4c9ba SHA512 e8f387a554c22fb2eb166d388085b9d68a0d865ae56ab71f3ffe09ff46bef04a4ba5b05ca51a1110e1dff67ae2cd6acc8b18a0fb9df9299dbbf4a001f0924f31
+EBUILD gnuserv-3.12.8-r3.ebuild 1548 BLAKE2B 2e959c2585f0c3000fae5129cdef1f33c67f9cabbea1242ac71b8ce9d5087579232fd1afe24357adb407e0855318e47c735b6c36c15eff94370e8a4b02a2c219 SHA512 5f36aaa6cfc4e643b7a8ed019d3063bd58f0730a86120772af34e749f537680619014097336353a631902fc8ecffdda763b9ad3aa17f17c255b1663964c9be71
+MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/gnuserv/files/50gnuserv-gentoo.el b/app-emacs/gnuserv/files/50gnuserv-gentoo.el
new file mode 100644
index 000000000000..12bf743e2f66
--- /dev/null
+++ b/app-emacs/gnuserv/files/50gnuserv-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(setq gnuserv-program "/usr/libexec/emacs/gnuserv")
+;; necessary for FSF GNU Emacs only
+(autoload 'gnuserv-start "gnuserv-compat"
+ "Allow this Emacs process to be a server for client processes." t)
diff --git a/app-emacs/gnuserv/files/gnuclient.desktop b/app-emacs/gnuserv/files/gnuclient.desktop
new file mode 100644
index 000000000000..4f390394ddd3
--- /dev/null
+++ b/app-emacs/gnuserv/files/gnuclient.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Gnuclient
+NoDisplay=true
+Comment=Tell a running Emacs to visit a file
+Comment[de]=In einer laufenden Emacs-Instanz eine Datei ffnen
+Comment[es]=Abrir un archivo en un Emacs corriente
+Comment[fr]=Ouvre un fichier dans une instance d'Emacs qui est dj lance
+TryExec=/usr/bin/gnuclient
+Exec=/usr/bin/gnuclient %F
+Terminal=false
+MimeType=text/css;text/english;text/html;text/plain;text/x-c;text/x-chdr;text/x-csrc;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-java;text/x-makefile;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r3.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r3.ebuild
new file mode 100644
index 000000000000..f7f72ec5e7dd
--- /dev/null
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp multilib desktop xdg-utils
+
+DESCRIPTION="Attach to an already running Emacs"
+HOMEPAGE="http://meltin.net/hacks/emacs/"
+SRC_URI="http://meltin.net/hacks/emacs/src/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-linux ~ppc-macos"
+IUSE="X"
+
+RDEPEND=">=app-eselect/eselect-emacs-1.15
+ X? ( x11-libs/libXau )"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ sed -i -e 's/exec gnuclient/&-emacs/' gnudoit || die
+ eapply_user
+}
+
+src_configure() {
+ econf $(use_enable X xauth) \
+ --x-includes="${EPREFIX}"/usr/include \
+ --x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ exeinto /usr/libexec/emacs
+ doexe gnuserv
+ newbin gnuclient gnuclient-emacs
+ newbin gnudoit gnudoit-emacs
+ # Don't install gnuattach, it is not functional with FSF GNU Emacs
+
+ newman gnuserv.1 gnuserv-emacs.1
+ echo ".so man1/gnuserv-emacs.1" | newman - gnuclient-emacs.1
+ echo ".so man1/gnuserv-emacs.1" | newman - gnudoit-emacs.1
+
+ elisp-install ${PN} *.el *.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc ChangeLog README README.orig
+
+ if use X; then
+ domenu "${FILESDIR}"/gnuclient.desktop || die
+ fi
+}
+
+pkg_postinst() {
+ elisp-site-regen
+ use X && xdg_desktop_database_update
+ eselect gnuclient update ifunset
+}
+
+pkg_postrm() {
+ elisp-site-regen
+ use X && xdg_desktop_database_update
+ eselect gnuclient update ifunset
+}
diff --git a/app-emacs/gnuserv/metadata.xml b/app-emacs/gnuserv/metadata.xml
new file mode 100644
index 000000000000..c438baf3b326
--- /dev/null
+++ b/app-emacs/gnuserv/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 type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-emacs/go-mode-1.4.0 b/app-emacs/go-mode-1.4.0
deleted file mode 100644
index 9fe632e25a87..000000000000
--- a/app-emacs/go-mode-1.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An improved Go mode for emacs
-EAPI=6
-HOMEPAGE=https://github.com/dominikh/go-mode.el
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/dominikh/go-mode.el/archive/v1.4.0.tar.gz -> go-mode-1.4.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=247235d1f8ad0bf07c308ffb4e5faa7b
diff --git a/app-emacs/go-mode-1.5.0 b/app-emacs/go-mode-1.5.0
deleted file mode 100644
index 5b64fbfaf2ae..000000000000
--- a/app-emacs/go-mode-1.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An improved Go mode for emacs
-EAPI=6
-HOMEPAGE=https://github.com/dominikh/go-mode.el
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/dominikh/go-mode.el/archive/v1.5.0.tar.gz -> go-mode-1.5.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=1db9b6722e79d0fb313dd9baeddba9a9
diff --git a/app-emacs/go-mode/Manifest b/app-emacs/go-mode/Manifest
new file mode 100644
index 000000000000..bbbc0bcee5f8
--- /dev/null
+++ b/app-emacs/go-mode/Manifest
@@ -0,0 +1,6 @@
+AUX 50go-mode-gentoo.el 71 BLAKE2B 1752654c85077e3a889127ab77e9e53a9703f79b08ea7f6f4898a86ac7c6db71d04bce7a08af4305b20d479067f779b0ed3ae30acb55bc3d1538b8eb6e0b9bf2 SHA512 f390651b52da9f5fb2a07b51a7fbbe52a4cb3391d6857b06a2c092148fc56378adb96477cf31eec23b554d9f4815e4ae7dc510f650a464c59f6b70fcb7311064
+DIST go-mode-1.4.0.tar.gz 30705 BLAKE2B c5b4f53697d18d1a727353c203ea5734a6a63f3e179ca8034d24cd6a414f1d7acecfecff5fc027fd465d7228f876beec558c0e0bca1865866bcef52e0183415a SHA512 00e3aa832b81d6039e38e12f1346ef838f0cd9ccbebac947d394d453690862025ce30fc253d52d485c3161a1c2307ef00272f014c8f3fa86304216525ae47bdd
+DIST go-mode-1.5.0.tar.gz 36876 BLAKE2B dca184f1cb79c919067ffecd1111f2404685459dca374a1ff14512067d0235bc862a04cb5fb014620856d0d03c15668149d0c62c238098b8561ea2512b26ec36 SHA512 fee67461467feb272dbb90abbad3df786f984925747ad8588c271784f8d27db888dd1da9d4589fb63ccfded1a833b01bb860d3254b00ca5e3f3aa89f199880c3
+EBUILD go-mode-1.4.0.ebuild 440 BLAKE2B 78de2c044fa0c9c2ad6849d4b716c8a9f54bef8febc5471c474fa15dcefe6b1afead63f5842a8c4c89976d76167f730f40b61726945d08613a226d9a400510d1 SHA512 1413b7fcf9dfbf51b54b8de54b3bfcf4dc4e662b3497bbb83e136294a28ea57bbcc59ca11d6eecebdaef45601d96ce69f42f834c3614d5718143ca92d34d32d1
+EBUILD go-mode-1.5.0.ebuild 440 BLAKE2B 75e0252733f6311d59cb3da310f1043aae12be1b92cf9e356c8ae4dc24b2d48ffc69f6e6bf40e2949eb845428c24e84b84bf606913d27704b73741ef882a699a SHA512 2fbcd8e7aef7b0d017603bfb7e6404a80537eb6d2cf8e93ed34937fee510730c244260f90ca3d52fedbfe822f8078145b41a8eee1af1289ce7d8fbb49ce1562e
+MISC metadata.xml 380 BLAKE2B 4d9b4f6b93adf63d6fe5cabd0e393cd1b0e6f7a8f440150b034c0099f24f8cae2ed8372b7f034679181dee6ea81a299eab3ad52a24bf0a57e5c3874d05f095e0 SHA512 7284d960c79d89a74d73b1f864d33f728ea84cb3e3245dc7ec3dc54715e1e0d911e993fa9e30ca560cbbd72aa9710165361c17f8d131e3a46dab90eb7abaf3b8
diff --git a/app-emacs/go-mode/files/50go-mode-gentoo.el b/app-emacs/go-mode/files/50go-mode-gentoo.el
new file mode 100644
index 000000000000..331db4c92fef
--- /dev/null
+++ b/app-emacs/go-mode/files/50go-mode-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "go-mode-autoloads" nil t)
diff --git a/app-emacs/go-mode/go-mode-1.4.0.ebuild b/app-emacs/go-mode/go-mode-1.4.0.ebuild
new file mode 100644
index 000000000000..6b4cb336e821
--- /dev/null
+++ b/app-emacs/go-mode/go-mode-1.4.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="An improved Go mode for emacs"
+HOMEPAGE="https://github.com/dominikh/go-mode.el"
+SRC_URI="https://github.com/dominikh/go-mode.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/go-mode.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="AUTHORS README.md"
diff --git a/app-emacs/go-mode/go-mode-1.5.0.ebuild b/app-emacs/go-mode/go-mode-1.5.0.ebuild
new file mode 100644
index 000000000000..67936074eb88
--- /dev/null
+++ b/app-emacs/go-mode/go-mode-1.5.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="An improved Go mode for emacs"
+HOMEPAGE="https://github.com/dominikh/go-mode.el"
+SRC_URI="https://github.com/dominikh/go-mode.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/go-mode.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="AUTHORS README.md"
diff --git a/app-emacs/go-mode/metadata.xml b/app-emacs/go-mode/metadata.xml
new file mode 100644
index 000000000000..686f91dccb5a
--- /dev/null
+++ b/app-emacs/go-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <stabilize-allarches/>
+ <upstream>
+ <remote-id type="github">dominikh/go-mode.el</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-emacs/google-c-style-20091009-r1 b/app-emacs/google-c-style-20091009-r1
deleted file mode 100644
index ca7752e165e8..000000000000
--- a/app-emacs/google-c-style-20091009-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Provides the google C/C++ coding style
-EAPI=4
-HOMEPAGE=https://github.com/google/styleguide
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/google-c-style-20091009.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=bee802399350b6667d0152ca4a2e277c
diff --git a/app-emacs/google-c-style/Manifest b/app-emacs/google-c-style/Manifest
new file mode 100644
index 000000000000..77b9b1507d88
--- /dev/null
+++ b/app-emacs/google-c-style/Manifest
@@ -0,0 +1,4 @@
+AUX 50google-c-style-gentoo.el 258 BLAKE2B 7ec733ac75a1d1570d11f3b978e0f55c3641b6e1ded4792afe54c3757453424fa0f76724f13bd060d5a63be7f37442649669043a8b7ed326c6b46cd58db1572b SHA512 f39b91a6af6e16ac70a5baee459790efb00aa10c3a83c16429fa5d97201bec2bfb3f6645ab1327f7325eb3428a3c938914b4a63c6009109dda99a4f0fe7d89c2
+DIST google-c-style-20091009.tar.bz2 2178 BLAKE2B 72d7b430f9148589e8b4b1a57c9b4b96203c7ffddae3bbbc7aa9978e85c2c51510571f8617ac5d2bcaabe5688ed7799d5de597e96a2479d844a49e6661f93a05 SHA512 5d61d6e021643ffc1468c14cdbbde0b52dc9346330983c19bdb7f4d6fb8960c662ca6198658963ff6d2b4d7d2dc96853a8c58de48da77364a860f2f777855b5a
+EBUILD google-c-style-20091009-r1.ebuild 602 BLAKE2B 5e9cbb6e0f5df7a7aaf1695b28a20ce0ecfac59fbe8a2357f2534a848ab720500c2ac3de410adcf9eda084a914b5da3fdf86fbfdddd02162c020cab232ff7615 SHA512 454136b3a79e9b4cd21a51b8771daa4efeab80b13c1fc09c8d372b864c96e10b26bcdcbe21e48b934689f69b263ba8cb8d758a8b32ac8f41a25ddc3c5c5621a3
+MISC metadata.xml 483 BLAKE2B 5321c357a3c496a72254753a00ca9e11ad6fdc420b2ab01990348c3d232d744d433ed01e5fc3de3aa6017dd805b057d3b2004d500db6fe1e38d69053c0d73179 SHA512 0f0c374e0ced07f64bf529899a190e7c4d1dadac58ef44355021fe00eeda190e2f270951242e8b1cc0b405328f2c251272da4713557600391e0ee82a35f689cb
diff --git a/app-emacs/google-c-style/files/50google-c-style-gentoo.el b/app-emacs/google-c-style/files/50google-c-style-gentoo.el
new file mode 100644
index 000000000000..3e9768b65db7
--- /dev/null
+++ b/app-emacs/google-c-style/files/50google-c-style-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'google-set-c-style "google-c-style"
+ "Set the current buffer's c-style to Google C/C++ Programming Style." t)
+(autoload 'google-make-newline-indent "google-c-style"
+ "Sets up preferred newline behavior." t)
diff --git a/app-emacs/google-c-style/google-c-style-20091009-r1.ebuild b/app-emacs/google-c-style/google-c-style-20091009-r1.ebuild
new file mode 100644
index 000000000000..c7353765122e
--- /dev/null
+++ b/app-emacs/google-c-style/google-c-style-20091009-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Provides the google C/C++ coding style"
+HOMEPAGE="https://github.com/google/styleguide"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S="${WORKDIR}"
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_postinst() {
+ elisp-site-regen
+
+ elog "Example usage (~/.emacs):"
+ elog " (add-hook 'c-mode-common-hook 'google-set-c-style)"
+ elog " (add-hook 'c-mode-common-hook 'google-make-newline-indent)"
+}
diff --git a/app-emacs/google-c-style/metadata.xml b/app-emacs/google-c-style/metadata.xml
new file mode 100644
index 000000000000..9508b69a2cc5
--- /dev/null
+++ b/app-emacs/google-c-style/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>chromium@gentoo.org</email>
+ <name>Chromium in Gentoo Project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">google/styleguide</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/graphviz-dot-mode-0.3.7 b/app-emacs/graphviz-dot-mode-0.3.7
deleted file mode 100644
index 675a1d115176..000000000000
--- a/app-emacs/graphviz-dot-mode-0.3.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs mode for editing and previewing Graphviz dot graphs
-EAPI=5
-HOMEPAGE=http://users.skynet.be/ppareit/projects/graphviz-dot-mode/graphviz-dot-mode.html http://www.graphviz.org/
-KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/graphviz-dot-mode-0.3.7.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=0a9b1697986ed99989f7bfaa86170977
diff --git a/app-emacs/graphviz-dot-mode/Manifest b/app-emacs/graphviz-dot-mode/Manifest
new file mode 100644
index 000000000000..a825b8077221
--- /dev/null
+++ b/app-emacs/graphviz-dot-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50graphviz-dot-mode-gentoo.el 258 BLAKE2B 8a0d626992f4c748f93084d9f666fec3ba562afe9003890dd5e640e57bd52f16a62e6abe70a4892c652007c195a83a095f801a9dfda43caa5c46bce59c6c0a0a SHA512 d233a05a4167f43c87419747a10e21050c1caf32d80fba6507bc07954154b589e9397ca4d82539bab2b706888457d2b9c821e5236f3d235ba9f9516b41f9a247
+DIST graphviz-dot-mode-0.3.7.el.xz 10840 BLAKE2B 6d4d80705ba01723ce538dcf97a218197c4d5295196d94c72dc5debdd59bf3e755227088a89b55c0ef019c9c4dbdaf5a7c01c441440ae8be32d5d472711160b2 SHA512 1b142cd4ea257a1b18f557d9b166db9c69538238c100d3eb682219df3488803566bbb366be6b57d129753c745b21a585eb815dbef870ad2e71560d4acc33edf3
+EBUILD graphviz-dot-mode-0.3.7.ebuild 541 BLAKE2B e665978e25cd49161c2e78544752f059a82078626da8392544df940c1f6b64faead2d97c74d819f15e702760717d35490b40654160757c05c9aa4253045eef17 SHA512 b6602909ad1431c5cf1543ffaa1c6512825e9d2c614096b8ae09808f8e32d7171ed0eb10950d1b144c042f9d8143f1ab7d9ab073db9f4c5422838e59641705f8
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/graphviz-dot-mode/files/50graphviz-dot-mode-gentoo.el b/app-emacs/graphviz-dot-mode/files/50graphviz-dot-mode-gentoo.el
new file mode 100644
index 000000000000..392d6f572ac4
--- /dev/null
+++ b/app-emacs/graphviz-dot-mode/files/50graphviz-dot-mode-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'graphviz-dot-mode "graphviz-dot-mode"
+ "Major mode for the dot language." t)
+(add-to-list 'auto-mode-alist '("\\.dot\\'" . graphviz-dot-mode))
+(add-to-list 'auto-mode-alist '("\\.gv\\'" . graphviz-dot-mode))
diff --git a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild
new file mode 100644
index 000000000000..16b3a2a373f5
--- /dev/null
+++ b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Emacs mode for editing and previewing Graphviz dot graphs"
+HOMEPAGE="http://users.skynet.be/ppareit/projects/graphviz-dot-mode/graphviz-dot-mode.html
+ http://www.graphviz.org/"
+# taken from http://users.skynet.be/ppareit/projects/${PN}/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/graphviz-dot-mode/metadata.xml b/app-emacs/graphviz-dot-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/graphviz-dot-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/h4x0r-0.13-r1 b/app-emacs/h4x0r-0.13-r1
deleted file mode 100644
index 27733119abb2..000000000000
--- a/app-emacs/h4x0r-0.13-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Aid in writing like a script kiddie does
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/EliteSpeech
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/h4x0r-0.13.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=301f11a63b200eb335215acb45503948
diff --git a/app-emacs/h4x0r/Manifest b/app-emacs/h4x0r/Manifest
new file mode 100644
index 000000000000..5559d10a50d4
--- /dev/null
+++ b/app-emacs/h4x0r/Manifest
@@ -0,0 +1,4 @@
+AUX 50h4x0r-gentoo.el 225 BLAKE2B fe1736e93c5072273af42daa2da7242ce13b81cb48e45ee7a0a75c067ff83bb8ebcde299aea7cf1537f8e2f9f23e6b1d916f7690c01710894f353079d5c660dd SHA512 892f48aed2b4552b842c986c4c963d422f74c29f7b7a7106039d3c66be7bf70de2664fb4e2798db0e71d09bbedeac1f738e3c30a3361afd4616462a95f6f4fbe
+DIST h4x0r-0.13.tar.gz 2033 BLAKE2B 202279ba4dd1f49bfb7609b47e10369444ae40a6b0b46ab22370d2af44315b642266b64f29883742e0111f2e67d55c1e864687f7792048e9d937bd9bae4c3961 SHA512 9648410ffa13ea9056c3def84108ff99966b62b7ee13fb48d5596d5c90f5d5296ff43d1c3ee2f534b7a219603ce1cbcd2a917307ea57ee6c914f9a8843eab0aa
+EBUILD h4x0r-0.13-r1.ebuild 361 BLAKE2B de16dc086e11e0a87fc5836160bebb9e9c14b43bca44ec3a3b81ea844acd8de8ec173c28d7b7a274b87aa0e579b13e37978a1db64558f8d883446e793516803d SHA512 6e074cc6073520695759124189274cd107de711a3036df54e8a9051ea71819dc1377e5ca39f86a041925ffe4dc55c51fba93d4047bedfd85e2dd4570f498da65
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/h4x0r/files/50h4x0r-gentoo.el b/app-emacs/h4x0r/files/50h4x0r-gentoo.el
new file mode 100644
index 000000000000..d2af8119a174
--- /dev/null
+++ b/app-emacs/h4x0r/files/50h4x0r-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'h4x0r-region "h4x0r" "Convert region to h4x0r-talk." t)
+(autoload 'h4x0r-buffer "h4x0r" "Convert entire buffer to h4x0r-talk." t)
+(autoload 'h4x0r-word-at-point "h4x0r" nil t)
diff --git a/app-emacs/h4x0r/h4x0r-0.13-r1.ebuild b/app-emacs/h4x0r/h4x0r-0.13-r1.ebuild
new file mode 100644
index 000000000000..4d9d96369ba7
--- /dev/null
+++ b/app-emacs/h4x0r/h4x0r-0.13-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Aid in writing like a script kiddie does"
+HOMEPAGE="https://www.emacswiki.org/emacs/EliteSpeech"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/h4x0r/metadata.xml b/app-emacs/h4x0r/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/h4x0r/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/haskell-mode-13.07 b/app-emacs/haskell-mode-13.07
deleted file mode 100644
index 8d6e1ed38c22..000000000000
--- a/app-emacs/haskell-mode-13.07
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=Mode for editing (and running) Haskell programs in Emacs
-EAPI=5
-HOMEPAGE=http://projects.haskell.org/haskellmode-emacs/ http://www.haskell.org/haskellwiki/Emacs#Haskell-mode
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-3+ FDL-1.2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/haskell/haskell-mode/archive/v13.07.tar.gz -> haskell-mode-13.07.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=5738abedf9ccb8b1b1d16ba6ac9ccb7b
diff --git a/app-emacs/haskell-mode-16.1 b/app-emacs/haskell-mode-16.1
deleted file mode 100644
index 91a7fc10623f..000000000000
--- a/app-emacs/haskell-mode-16.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=Mode for editing (and running) Haskell programs in Emacs
-EAPI=6
-HOMEPAGE=https://haskell.github.io/haskell-mode/ https://www.haskell.org/haskellwiki/Emacs#Haskell-mode
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-3+ FDL-1.2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/haskell/haskell-mode/archive/v16.1.tar.gz -> haskell-mode-16.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=77407a1384a072e0008dc66d51dc3cd0
diff --git a/app-emacs/haskell-mode-2.9.1 b/app-emacs/haskell-mode-2.9.1
deleted file mode 100644
index fff6dc236125..000000000000
--- a/app-emacs/haskell-mode-2.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Mode for editing (and running) Haskell programs in Emacs
-EAPI=5
-HOMEPAGE=http://projects.haskell.org/haskellmode-emacs/ http://www.haskell.org/haskellwiki/Emacs#Haskell-mode
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/haskell/haskell-mode/archive/2_9_1.tar.gz -> haskell-mode-2.9.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=134513d548b478ca3623d777b809e483
diff --git a/app-emacs/haskell-mode/Manifest b/app-emacs/haskell-mode/Manifest
new file mode 100644
index 000000000000..94f50c8025ba
--- /dev/null
+++ b/app-emacs/haskell-mode/Manifest
@@ -0,0 +1,8 @@
+AUX 50haskell-mode-gentoo.el 44 BLAKE2B 1587be01b819c8d788bc8b9c3e9481885b2be3ceda43336f8d8728f245c961cb49aa6b1245558ce4d25ed28fcfc310c4fa95f992335ca75b6cdff90e33f18af0 SHA512 3a4dc946f9f5b5e7dfed41d19b8e576f3d164d81049b7bcad08791803116104f0450634569ee60a65f78e42b2153b925062b05f31cf8b5477160a73eadbfcf2a
+DIST haskell-mode-13.07.tar.gz 131102 BLAKE2B 402a4f21eb400c0f20a17b37c556b2f3eb949ef7fe38ffc2a0f7384ef252da9f69a6ab405ab782ab9739d2b2e57bab5c471c840cc8c3e4db7b42082f8e5bb428 SHA512 e19d55a99f4d9a571c1ed0b095254e4d1b8080d9ba671461aa228cbf8aa7c7a213e19e588c0f69450a1bd4ac25793b523415a6f11bfb5dda7706dc35f7beee68
+DIST haskell-mode-16.1.tar.gz 1192866 BLAKE2B 5a53075be5ea1246f2aa61d1004fb282d6c5e182497f7660336cf89634bde3b6455997286a4e7e599bf044a9d5c47384f44addb1ab6f53a257c749a93849992e SHA512 28654499ee521032be1ae6edfd338cab6022d7fdd4ff34e720ffe249801d4b442484cce4f5fc3461aa5145918f66f4b69df774b60cceb408220fc0533386cc56
+DIST haskell-mode-2.9.1.tar.gz 123579 BLAKE2B f6aa2d989961868d2de5815ccfe79fbc75902ca33572a799e4967047685fe8d598aa3057d655ed0006c5d814e706ee94e6460c702d4bf88ba253acd0187e0970 SHA512 7c4cbdfd0f9e43ab3efd39c8ca7fcd941538865fe41522703175b7ca8a67276945ef7feef4207fa66aee156a028cb52bb96593867db0c777baba9f59415ee979
+EBUILD haskell-mode-13.07.ebuild 1163 BLAKE2B cf11607be57dc65c16bd9519ffd7f97aa359eec9d657c5325fc09c522f33f7448fffa50da56bbbc1fe17836e43e55157e4da9101062ae6f9ba714fb82f84bec9 SHA512 a3bf4975f672f62835ae80f600b1dea83e1480d05d0a56e0261ab97c9b6d0417ceef923a142fd23087038e547b4ed8f2d21cf59151a26ec74d6b94f1051fbc71
+EBUILD haskell-mode-16.1.ebuild 1050 BLAKE2B b0667cb95a16e9ee94d527002e32ad3877612d95bd3b3ac2f73f6e3693e7ec6bdd29458745d63722e6d9c529ab1ada959b9d733234fb996deae3de778d8cabb1 SHA512 08eae466b741962a41ae17d23f04dbfe1aa327659e901b757741ce721bedd486d76a33d12a45c56d95af749ca1c9d43dc11bba474be4b95ff4aba7566fce9680
+EBUILD haskell-mode-2.9.1.ebuild 1025 BLAKE2B de3b65e493a238f45a2872fa721f288d0639b67f36fa8ea85906fcdd2c787a7e4bca5d3b2fccdb36cf80dfeb8e1cb181ef8f8db378d7407a0749e78dc5aaf462 SHA512 3ba4e5d481325c864c1add293cb9a1c8d9e7e42360760f857666aae90fcc9b6aa4afc03b76ada8dcd32652b517ed0d2736e68e8b4c2f3545fa1ff556c1acae3f
+MISC metadata.xml 365 BLAKE2B 83d22f60eb396ae5edeb56a673d3eade22441caf345af215e9c288663b0c5fc9838e714924fcee0ab939e8308663bad7e1eddc3490f2dfc24b98f518ad4fd337 SHA512 60afa0ec1eeb97ab4636b806aa544a277838ad64703a213eb30a8d3981abd1a0fcdd6c6d7de94afbd1dee29c92d8c7fe4112e827ee2e8016b537307634aab025
diff --git a/app-emacs/haskell-mode/files/50haskell-mode-gentoo.el b/app-emacs/haskell-mode/files/50haskell-mode-gentoo.el
new file mode 100644
index 000000000000..90e85d0a4291
--- /dev/null
+++ b/app-emacs/haskell-mode/files/50haskell-mode-gentoo.el
@@ -0,0 +1 @@
+(load "@SITELISP@/haskell-site-file" nil t)
diff --git a/app-emacs/haskell-mode/haskell-mode-13.07.ebuild b/app-emacs/haskell-mode/haskell-mode-13.07.ebuild
new file mode 100644
index 000000000000..ffc84c434453
--- /dev/null
+++ b/app-emacs/haskell-mode/haskell-mode-13.07.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Mode for editing (and running) Haskell programs in Emacs"
+HOMEPAGE="http://projects.haskell.org/haskellmode-emacs/
+ http://www.haskell.org/haskellwiki/Emacs#Haskell-mode"
+SRC_URI="https://github.com/haskell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+
+DEPEND="sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="haskell-mode.texi"
+DOCS="NEWS README.md examples/*.hs examples/init.el"
+
+src_prepare() {
+ # We install the logo in SITEETC, not in SITELISP
+ # https://github.com/haskell/haskell-mode/issues/102
+ sed -i -e "/defconst haskell-process-logo/{n;" \
+ -e "s:(.*\"\\(.*\\)\".*):\"${SITEETC}/${PN}/\\1\":}" \
+ haskell-process.el || die
+}
+
+src_compile() {
+ elisp_src_compile
+ elisp-make-autoload-file haskell-site-file.el
+}
+
+src_test() {
+ # perform tests in a separate directory #504660
+ mkdir test && cp *.el Makefile test || die
+ emake -C test check
+}
+
+src_install() {
+ elisp_src_install
+ insinto "${SITEETC}/${PN}"
+ doins logo.svg
+}
diff --git a/app-emacs/haskell-mode/haskell-mode-16.1.ebuild b/app-emacs/haskell-mode/haskell-mode-16.1.ebuild
new file mode 100644
index 000000000000..a8d61e5c904d
--- /dev/null
+++ b/app-emacs/haskell-mode/haskell-mode-16.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Mode for editing (and running) Haskell programs in Emacs"
+HOMEPAGE="https://haskell.github.io/haskell-mode/
+ https://www.haskell.org/haskellwiki/Emacs#Haskell-mode"
+SRC_URI="https://github.com/haskell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="doc/haskell-mode.texi"
+DOCS="NEWS README.md"
+
+src_prepare() {
+ # We install the logo in SITEETC, not in SITELISP
+ # https://github.com/haskell/haskell-mode/issues/102
+ sed -i -e "/defconst haskell-process-logo/{n;" \
+ -e "s:(.*\"\\(.*\\)\".*):\"${SITEETC}/${PN}/\\1\":}" \
+ haskell-process.el || die
+
+ eapply_user
+}
+
+src_compile() {
+ elisp_src_compile
+ elisp-make-autoload-file haskell-site-file.el
+}
+
+src_test() {
+ emake check-ert
+}
+
+src_install() {
+ elisp_src_install
+ insinto "${SITEETC}/${PN}"
+ doins logo.svg
+}
diff --git a/app-emacs/haskell-mode/haskell-mode-2.9.1.ebuild b/app-emacs/haskell-mode/haskell-mode-2.9.1.ebuild
new file mode 100644
index 000000000000..c64e1eed6fa7
--- /dev/null
+++ b/app-emacs/haskell-mode/haskell-mode-2.9.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+MY_PV=${PV//./_}
+DESCRIPTION="Mode for editing (and running) Haskell programs in Emacs"
+HOMEPAGE="http://projects.haskell.org/haskellmode-emacs/
+ http://www.haskell.org/haskellwiki/Emacs#Haskell-mode"
+SRC_URI="https://github.com/haskell/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+DOCS="NEWS README.md *.hs examples/init.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ # We install the logo in SITEETC, not in SITELISP
+ # https://github.com/haskell/haskell-mode/issues/102
+ sed -i -e "/defconst haskell-process-logo/{n;" \
+ -e "s:(.*\"\\(.*\\)\".*):\"${SITEETC}/${PN}/\\1\":}" \
+ haskell-process.el || die
+}
+
+src_compile() {
+ elisp-make-autoload-file haskell-site-file.el || die
+ elisp-compile *.el || die
+}
+
+src_install() {
+ elisp_src_install
+ insinto "${SITEETC}/${PN}"
+ doins logo.svg
+}
diff --git a/app-emacs/haskell-mode/metadata.xml b/app-emacs/haskell-mode/metadata.xml
new file mode 100644
index 000000000000..c0645d492885
--- /dev/null
+++ b/app-emacs/haskell-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">haskell/haskell-mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/hexrgb-0_p957 b/app-emacs/hexrgb-0_p957
deleted file mode 100644
index 40b3f1efb072..000000000000
--- a/app-emacs/hexrgb-0_p957
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Functions to manipulate colors, including RGB hex strings
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/hexrgb.el
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/hexrgb-0_p957.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=77adb975f12d919fdcf4ea8d326be6a8
diff --git a/app-emacs/hexrgb/Manifest b/app-emacs/hexrgb/Manifest
new file mode 100644
index 000000000000..e7a2af16cea3
--- /dev/null
+++ b/app-emacs/hexrgb/Manifest
@@ -0,0 +1,4 @@
+AUX 50hexrgb-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST hexrgb-0_p957.el.xz 9620 BLAKE2B 6bcb432cce9a0981f19acd4beba785941148fa9ca8ebd2575b2ef4a39fe28c641160b5c27d6515220f122e66154d89807ba0075e41c2506d5c8aa1a6b291404c SHA512 5948dac5a771a7d3e9632a9783478181a39c4cb0e6d399ec8793730883182e44eb1aeef1dc9ebaadb4004f1b766e85033f79fa6db4b68ed5b11d38eec5b934d1
+EBUILD hexrgb-0_p957.ebuild 403 BLAKE2B 393babe59dfa2937f17184141283dfeacabe5b99bd4a5bc5f6b546ed301573641ac9e0c02908af03b0704afc01f8bfac2f0123a9bc725529b3b1ed1f37ed84e9 SHA512 4b60ecd175075104257653b916d5c99724f5ca7b7000f4cded86641f745f4612115b7820dc888a626e40f453bed621e41902092f6e9663998abe5bd6720782be
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/hexrgb/files/50hexrgb-gentoo.el b/app-emacs/hexrgb/files/50hexrgb-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/hexrgb/files/50hexrgb-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/hexrgb/hexrgb-0_p957.ebuild b/app-emacs/hexrgb/hexrgb-0_p957.ebuild
new file mode 100644
index 000000000000..0845e1e8af46
--- /dev/null
+++ b/app-emacs/hexrgb/hexrgb-0_p957.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Functions to manipulate colors, including RGB hex strings"
+HOMEPAGE="https://www.emacswiki.org/emacs/hexrgb.el"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/hexrgb/metadata.xml b/app-emacs/hexrgb/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/hexrgb/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/highline-7.2.2 b/app-emacs/highline-7.2.2
deleted file mode 100644
index dba599d5d24a..000000000000
--- a/app-emacs/highline-7.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Minor mode to highlight current line in buffer
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/HighlineMode
-KEYWORDS=amd64 ppc ~s390 x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/highline-7.2.2.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=324208d57617741dbfa6670a6592f89d
diff --git a/app-emacs/highline/Manifest b/app-emacs/highline/Manifest
new file mode 100644
index 000000000000..fa817e02c3ec
--- /dev/null
+++ b/app-emacs/highline/Manifest
@@ -0,0 +1,4 @@
+AUX 50highline-gentoo.el 72 BLAKE2B 0c0f641042009cc056675c7dc4c523821cdb71f641e6cc8ea4f5d8f2885f0c8796386822d172baea078f5f45aae02a58e76dbbc12f967526da50db7ae68b6a07 SHA512 e619a8d2dac5926c4e2d99237dc473949ecb5e4d6e80ee532e258a710b3597e0bdfefc33558b00a1b21276383ce7e3b8196e30548ed8daf8a66173d1a559cb99
+DIST highline-7.2.2.el.xz 8600 BLAKE2B e92007f6ee38e67441b8d9e7b029570e5ef2ecb888f971191f7e1fb919ffe0c58e2e5abc7d4615449e786b882f0e7b511ed37d85de6d3b98658d4ce5a1cb9253 SHA512 353fc034a823d0892c6266fbc48a22e2650c379f904f9a0be78bd2f11e5ac8333cf6070fa7ebc2225c57cc6a85f49c6db9322e31e33f87e481aa117b1290be87
+EBUILD highline-7.2.2.ebuild 523 BLAKE2B 04404f321d0cecc70ae07287844fc27d257a56b37d4f73f7bed9188adc58944e7a97bc158eebd28c0b6794ae252cff5b3100c9d48111b7f690ca0113aa62a6d1 SHA512 de66f3d009b77fff62db8743292dff4767c893b2e4c89c1e0aaec4cdfe0cf9031dc64c8453e085dd56ae5009ec5418069b1ca4229dfebc983b1413e45a69b438
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/highline/files/50highline-gentoo.el b/app-emacs/highline/files/50highline-gentoo.el
new file mode 100644
index 000000000000..7fd8b824998e
--- /dev/null
+++ b/app-emacs/highline/files/50highline-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "highline-autoloads" nil t)
diff --git a/app-emacs/highline/highline-7.2.2.ebuild b/app-emacs/highline/highline-7.2.2.ebuild
new file mode 100644
index 000000000000..fdbbc896d752
--- /dev/null
+++ b/app-emacs/highline/highline-7.2.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Minor mode to highlight current line in buffer"
+HOMEPAGE="https://www.emacswiki.org/emacs/HighlineMode"
+# taken from: http://www.emacswiki.org/emacs/download/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ppc ~s390 x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile *.el
+ elisp-make-autoload-file
+}
diff --git a/app-emacs/highline/metadata.xml b/app-emacs/highline/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/highline/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/howm-1.4.3 b/app-emacs/howm-1.4.3
deleted file mode 100644
index 79034e70a66a..000000000000
--- a/app-emacs/howm-1.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Note-taking tool on Emacs
-EAPI=6
-HOMEPAGE=http://howm.sourceforge.jp/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-1+ GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://howm.sourceforge.jp/a/howm-1.4.3.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=04d46ed151d4abf45fe98af177f47e8e
diff --git a/app-emacs/howm/Manifest b/app-emacs/howm/Manifest
new file mode 100644
index 000000000000..c788a46138cb
--- /dev/null
+++ b/app-emacs/howm/Manifest
@@ -0,0 +1,4 @@
+AUX 50howm-gentoo.el 73 BLAKE2B fe99991f69e8aa4c515aa458980b82fcba96f2dcc29d213b662c5d81231aa85dc288b3135dc375a099a57344646a3a9a0c0ad0eb57fec4f78f8ec0d1ddc1ce60 SHA512 575a4638fa232ced8b377e30bd405dd78a8d10194cb38f40041ff30187482cec2cecf94c8f9da95031848e6c0379a2d845ed7b9eb159b63ed0a0737afa627a82
+DIST howm-1.4.3.tar.gz 552747 BLAKE2B 26ddf709fcbcefb962a3cf447c1ccaef61b2407cb875be49a7a207159db5c2425fff953859c2c77ec36250e73d9da17647667d2e0a4448ed0dc40bb25ded0635 SHA512 da6eec498545dced3bad3c6968bb31a24b01b85220dd80c6e1ee312a0cf1a0b883dc77744f5052261e4bf0d536da057fbe05040fbb429b61a8580330750ce189
+EBUILD howm-1.4.3.ebuild 588 BLAKE2B fd5660cbfce9cbb9e2b3dc6f02caa61b8cc5d2547667f9894792380b021bbcc223fe5544a61d88e3411a85cb6893c6c60f74b183239123b04fe0fb27f1840a6c SHA512 19e8d992766b8a6b821d0787bc3a6f9f939d3d63a9d401e30b7507f3c32123a1c9165ccaeab471a35b5b258d349ab4d59516da8b1d7293e03901f596580b3728
+MISC metadata.xml 357 BLAKE2B cdcdb822544ef99c142c343a3a7b68b825bf32fa45ec34016b2cbc6736a83ad925cabcae1a73e7a87ed5ab2c8704db7a0446d8b97bea533083d5f0f88482cb65 SHA512 1fff5ee37f3d2bf46732a5f23c06db0267f7f38357602f5268c29fb840b9450b380057993cdb5e0c540cef9d4c0e3e6e8a5c0b618f02d2493d92b0f44aebba93
diff --git a/app-emacs/howm/files/50howm-gentoo.el b/app-emacs/howm/files/50howm-gentoo.el
new file mode 100644
index 000000000000..d5dc8180f379
--- /dev/null
+++ b/app-emacs/howm/files/50howm-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'howm-menu "howm" nil t)
diff --git a/app-emacs/howm/howm-1.4.3.ebuild b/app-emacs/howm/howm-1.4.3.ebuild
new file mode 100644
index 000000000000..345562c1563a
--- /dev/null
+++ b/app-emacs/howm/howm-1.4.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Note-taking tool on Emacs"
+HOMEPAGE="http://howm.sourceforge.jp/"
+SRC_URI="http://howm.sourceforge.jp/a/${P}.tar.gz"
+
+LICENSE="GPL-1+ GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+ default
+}
+
+src_compile() {
+ emake -j1 </dev/null
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install </dev/null
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc ChangeLog
+}
diff --git a/app-emacs/howm/metadata.xml b/app-emacs/howm/metadata.xml
new file mode 100644
index 000000000000..681cb37124e3
--- /dev/null
+++ b/app-emacs/howm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge-jp">howm</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/htmlize-1.43 b/app-emacs/htmlize-1.43
deleted file mode 100644
index b65b12fa09f1..000000000000
--- a/app-emacs/htmlize-1.43
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=HTML-ize font-lock buffers in Emacs
-EAPI=4
-HOMEPAGE=https://www.emacswiki.org/emacs/Htmlize http://fly.srk.fer.hr/~hniksic/emacs/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/htmlize-1.43.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=b473dcc8260b44e56ffe5fb92afec84e
diff --git a/app-emacs/htmlize-1.47 b/app-emacs/htmlize-1.47
deleted file mode 100644
index 7c681c00205f..000000000000
--- a/app-emacs/htmlize-1.47
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=HTML-ize font-lock buffers in Emacs
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/Htmlize http://fly.srk.fer.hr/~hniksic/emacs/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/htmlize-1.47.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=6ec1ed3b0e5da0b2f515f7445171eed4
diff --git a/app-emacs/htmlize/Manifest b/app-emacs/htmlize/Manifest
new file mode 100644
index 000000000000..a00f4bba574f
--- /dev/null
+++ b/app-emacs/htmlize/Manifest
@@ -0,0 +1,6 @@
+AUX 50htmlize-gentoo.el 543 BLAKE2B 65ee2f1bd7aeb315827301a74582d9c04ceacf898a5cdd9a72f6783bcc2e4d1f97d681f67daeea24fa3489ae7a4db02875161c20a88330edaaa828a0c37b3bb5 SHA512 7bc9bc6cd113ec9090223b6bf3f373b25da1e4330039be37186904360a515ea102b51c2c6567e9e3fed7f78c4c29a0f80642e35878a2af61e83772b8a5bad99e
+DIST htmlize-1.43.el.bz2 21018 BLAKE2B ff07571bda31c3733e3a5ef703625ea485721080d13ad28f7e2be3f7470cae7f00ebf7f7a899a7351942643c5f3b854f01918b9fd3175b8f7ba0ae9237665d42 SHA512 cdef3f8478862e9743cad23697775111fbd64737daa6e0525923cff1ccc8dfd20ad554e5e92ec99281d87acf9ecd358474761858c8c6639c5459234bf79d4be9
+DIST htmlize-1.47.el.xz 21544 BLAKE2B c00222fa39bbd530fae89b6a71cc515dd37cce4d787267eca9d23eddd9f3054b932df8908712971c46c28fc89921a42ac613e826d73094b333aa977335077f54 SHA512 2cca746f696d382336a800d3f15e6a5812afa7c6965d6695c501085ed6c8f447da8ee6ed31a27c240e9d70f7c30b91292ac60c0c903a7ca0d52f2a4bfedbf06f
+EBUILD htmlize-1.43.ebuild 399 BLAKE2B e5b22c1cd35481e4cd89200d42adcccd1ff6ab751e40927161b9095f938d9674b2646cfe6359153f97c4155e39f477785169e0b4442489a37934a663d3d6081e SHA512 f46ebc4c02904c46990d99fe860c7189dde0df5c74807d547809b7ef0207bfa1c152ec4c4701df7747f3bab0e6fbc5dd455b8aa8ec66cb39701f3f361266f33e
+EBUILD htmlize-1.47.ebuild 412 BLAKE2B e6ba52cf40a4941a1efa543d5d94bfc2fb521fbff3dfcf9086a89949c772634c44d566f8c4808badfa58c273a06107d6308f4bfd27ee6be7458186a0eed5d60f SHA512 0255f5a8d6b4d03f8ee3c502e59b719baf3842ceae9510254a2f533a8f08616d4a5e4d2ce747a3b567ad42864652e09f7f2504cf8d77d389e93caff3ad60019a
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/htmlize/files/50htmlize-gentoo.el b/app-emacs/htmlize/files/50htmlize-gentoo.el
new file mode 100644
index 000000000000..85dd15653999
--- /dev/null
+++ b/app-emacs/htmlize/files/50htmlize-gentoo.el
@@ -0,0 +1,11 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'htmlize-buffer "htmlize"
+ "Convert BUFFER to HTML, preserving colors and decorations." t)
+(autoload 'htmlize-region "htmlize"
+ "Convert the region to HTML, preserving colors and decorations." t)
+(autoload 'htmlize-file "htmlize"
+ "Load FILE, fontify it, convert it to HTML, and save the result." t)
+(autoload 'htmlize-many-files "htmlize"
+ "Convert FILES to HTML and save the corresponding HTML versions." t)
+(autoload 'htmlize-many-files-dired "htmlize"
+ "HTMLize dired-marked files." t)
diff --git a/app-emacs/htmlize/htmlize-1.43.ebuild b/app-emacs/htmlize/htmlize-1.43.ebuild
new file mode 100644
index 000000000000..e614aa73039a
--- /dev/null
+++ b/app-emacs/htmlize/htmlize-1.43.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="HTML-ize font-lock buffers in Emacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/Htmlize
+ http://fly.srk.fer.hr/~hniksic/emacs/"
+SRC_URI="mirror://gentoo/${P}.el.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/htmlize/htmlize-1.47.ebuild b/app-emacs/htmlize/htmlize-1.47.ebuild
new file mode 100644
index 000000000000..fa7ad085cc8a
--- /dev/null
+++ b/app-emacs/htmlize/htmlize-1.47.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="HTML-ize font-lock buffers in Emacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/Htmlize
+ http://fly.srk.fer.hr/~hniksic/emacs/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/htmlize/metadata.xml b/app-emacs/htmlize/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/htmlize/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/httpd-1.1 b/app-emacs/httpd-1.1
deleted file mode 100644
index 09720d8233fd..000000000000
--- a/app-emacs/httpd-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A HTTP server embedded in the Emacs
-EAPI=5
-HOMEPAGE=http://www.chez.com/emarsden/downloads/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/httpd-1.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=aaf120d14a436b709ffe81a3c3e7806b
diff --git a/app-emacs/httpd/Manifest b/app-emacs/httpd/Manifest
new file mode 100644
index 000000000000..173a1228a87a
--- /dev/null
+++ b/app-emacs/httpd/Manifest
@@ -0,0 +1,4 @@
+AUX 50httpd-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST httpd-1.1.tar.gz 3770 BLAKE2B 00fa14b035db349504d96fd01fc2881052e45d73a5084b33d77b3f6edb8f675c4467a048eae5fee6e502ecbe27c740d0827b35c724d016aef6446724b0d2a3f5 SHA512 b6078e8dd79ed4bcdabc85640ce14f556b14f82efb1429382ff75aefcd19ce586978ac79c59c4a20865fc67e103451937bc1e49dcca64dbdab4364c4e29510a2
+EBUILD httpd-1.1.ebuild 410 BLAKE2B 99e4bfa9078e76224500c75cfbf972b729fd44cd120f6813c93efcabcf01c9d94fb50afaf5b54a916cf84cb39eef058db3e8ccb5715ac7fe6903420f61560c4b SHA512 ed0edf4b4f027dfd71b62cafd880a72ae91a89b14ece2d86ec43a17deef03e6675f1439abc2099ec63eba1ec59c18d764c6a92abebb97c9d783cfc89576406d7
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/httpd/files/50httpd-gentoo.el b/app-emacs/httpd/files/50httpd-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/httpd/files/50httpd-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/httpd/httpd-1.1.ebuild b/app-emacs/httpd/httpd-1.1.ebuild
new file mode 100644
index 000000000000..c145e05dfc2f
--- /dev/null
+++ b/app-emacs/httpd/httpd-1.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A HTTP server embedded in the Emacs"
+HOMEPAGE="http://www.chez.com/emarsden/downloads/"
+# taken from contrib/httpd.el in app-emacs/muse
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/httpd/metadata.xml b/app-emacs/httpd/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/httpd/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/icicles-2013.04.23.23400 b/app-emacs/icicles-2013.04.23.23400
deleted file mode 100644
index 4d9d463f5550..000000000000
--- a/app-emacs/icicles-2013.04.23.23400
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Minibuffer input completion and cycling
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/Icicles
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/emacsmirror/icicles/archive/2013.04.23.23400.tar.gz -> icicles-2013.04.23.23400.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=d5fca20b6cd88db9dd843d5d0e157442
diff --git a/app-emacs/icicles-2018.02.13.23733 b/app-emacs/icicles-2018.02.13.23733
deleted file mode 100644
index 761d9e6fe403..000000000000
--- a/app-emacs/icicles-2018.02.13.23733
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=virtual/emacs-23
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=Minibuffer input completion and cycling
-EAPI=7
-HOMEPAGE=https://www.emacswiki.org/emacs/Icicles
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/icicles-2018.02.13.23733.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=2d73a2a1b120177c8ca359abc399f902
diff --git a/app-emacs/icicles/Manifest b/app-emacs/icicles/Manifest
new file mode 100644
index 000000000000..0555c4febe95
--- /dev/null
+++ b/app-emacs/icicles/Manifest
@@ -0,0 +1,6 @@
+AUX 50icicles-gentoo.el 112 BLAKE2B c4d0e44325f27cb725bce0aff0ac8186807295c9b20642f42fabfa956703836c65a23b3a71221e736d95aefa1e4e188834df53c9a275ddc0ec7389a810bd405f SHA512 dee9b1945ea378792e71efa674bdeae5ec82eaa8f8ea07fd7859ff3e48d812fc50c8a4809a2a66c99ffe08c4b2b71a107245970ec2cddbe0505b63999b62320e
+DIST icicles-2013.04.23.23400.tar.gz 886525 BLAKE2B 92325f9486f3008b45d336828025e828b83bdeb91ea7fef3a72f8093b9800ca1303cebcc3cc6c7c4bfadb9b66a26371f55a98498a34d23dc3511d1e2f6de4b36 SHA512 548c20fe83f72d03820d620d0d5f9feb6d249ca96c8f951ddbf650691ad30649d28d736b7c01677e260fed0490382a5771c0e88adef6c9c0089ecbd225f9acd5
+DIST icicles-2018.02.13.23733.tar.xz 697112 BLAKE2B 63b60a74cfcc5b855e9ffbf7a91d0cb561c46ef1a93fb1baca00a0a5462326da983c734bef1943c0f17583aeb065d8fd5d88769eec2dc35f36a59ea4ff86609b SHA512 6c5d2270c735fafa8e2180134fbe7175e1c99cb6ae904a70dbdf1144293bd1ffa84d9e81b1c1b03296348a6b31ebab62ea7981a4b7f5be8bb5238bd143ccb3c0
+EBUILD icicles-2013.04.23.23400.ebuild 401 BLAKE2B deae89002a1509b6087b034c18b9f4ec560e5cc39308948d5f92123410ca287cc9d1effc7e479e6194009affed126a1fc6d98581c6e1d20b169f568e7b970409 SHA512 3d697cbed9b5e35db6bc370eea722a8d5c5ada439bcfddc14498740a02ff81bc4065628dd11e5002b3c2e796877e1fd079638f2468551083ac893ba16091cfd8
+EBUILD icicles-2018.02.13.23733.ebuild 488 BLAKE2B 0aba0b0c414bd4eae4ff6387374fe4db7cf7c5f74338ce512d1b7ccd64ec3b7492d6f3418116e07ef75d39f61ebfb0adca0424bf21d3066272524fc0e89eb18a SHA512 de723e4123003f1fba99840c9dcdc7c99e329294b96a5650c518bf9cb559abecc2231ec373d76ba121b289e37a8961a3baa4968da25b1e653c4b4e805351488f
+MISC metadata.xml 364 BLAKE2B 89531668a33bd3ba547d5b7398504ee761731e04224e76a3d155be7048f9686aa111727c9a295f5520e8d7a72d85b4aa2461acd1e7f420faac2e907bfc5424ec SHA512 d889cc1477d8d0cac50bbf0a9866cd5f58194bb62634672f9071f6305b16add9e19462474bdb6e160c57b1efd0f89915faac10b874775a74cf6cbe19ad4e5fec
diff --git a/app-emacs/icicles/files/50icicles-gentoo.el b/app-emacs/icicles/files/50icicles-gentoo.el
new file mode 100644
index 000000000000..85debb666b64
--- /dev/null
+++ b/app-emacs/icicles/files/50icicles-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'icicle-mode "icicles" nil t)
+(defalias 'icy-mode 'icicle-mode)
diff --git a/app-emacs/icicles/icicles-2013.04.23.23400.ebuild b/app-emacs/icicles/icicles-2013.04.23.23400.ebuild
new file mode 100644
index 000000000000..341a08fa8d7b
--- /dev/null
+++ b/app-emacs/icicles/icicles-2013.04.23.23400.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Minibuffer input completion and cycling"
+HOMEPAGE="https://www.emacswiki.org/emacs/Icicles"
+SRC_URI="https://github.com/emacsmirror/icicles/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/icicles/icicles-2018.02.13.23733.ebuild b/app-emacs/icicles/icicles-2018.02.13.23733.ebuild
new file mode 100644
index 000000000000..e8cd70e63cc3
--- /dev/null
+++ b/app-emacs/icicles/icicles-2018.02.13.23733.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Minibuffer input completion and cycling"
+HOMEPAGE="https://www.emacswiki.org/emacs/Icicles"
+# Snapshot of https://github.com/emacsmirror/icicles.git
+# PV is <Version>.<Update #> from header of icicles.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/icicles/metadata.xml b/app-emacs/icicles/metadata.xml
new file mode 100644
index 000000000000..1924e3f148ef
--- /dev/null
+++ b/app-emacs/icicles/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">emacsmirror/icicles</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/identica-mode-1.1-r1 b/app-emacs/identica-mode-1.1-r1
deleted file mode 100644
index 524ed9d84339..000000000000
--- a/app-emacs/identica-mode-1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=Identi.ca mode for Emacs
-EAPI=4
-HOMEPAGE=http://blog.nethazard.net/identica-mode-for-emacs/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ FDL-1.2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/identica-mode-1.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=9f493811f73c2ca8c9a52129836ba2df
diff --git a/app-emacs/identica-mode/Manifest b/app-emacs/identica-mode/Manifest
new file mode 100644
index 000000000000..fe2b3ff612a7
--- /dev/null
+++ b/app-emacs/identica-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50identica-mode-gentoo.el 100 BLAKE2B 07dca19b3dc51d3f658f65b0f43220f1f93e641911cd8ccb12c165d78a485c53354c9d35e169e71d1c9599e2d5ab8789fe197f908e74961a7100f25e82246342 SHA512 a66bd1815b342f214d1ff9a511408b17a378b48d733bbd5c9bbf0303e6be3f707f1daeeeadf452594fa6b3dc22ab71cd7c9f0b1a4d6f182ea30a72725f6f1461
+DIST identica-mode-1.1.tar.gz 33078 BLAKE2B f10665b5468a2fef27dc7142aa88aab1ee7583872149654b1d4f072e74732ae9512e117a2c9d26c99b2445dc93d370c77250fe4c80e432865983d1fafe4fd0da SHA512 c8dfe17da04d7124398065a171829b30036d1df32d383c0297c0155a2fbe4a8260901c903194c1136c05add960270aea4b92a9b97928541985ff1c2f1084f53c
+EBUILD identica-mode-1.1-r1.ebuild 721 BLAKE2B 927f9a564865553b9512332d881ce7183d67d970eaea159b0702f1eb17af73eaaae989e3842d55fea0c4127904cf9fdd113e959cca034d3d1bdc9d56c08dfcf4 SHA512 32751fe1638ec72143db8a1d80e45033f6a88261402637d62f9ec4417c3e7e75ad8c6fd9502d503707da958929713f98aecdbc29c5ecccf9958e08d427f18c2b
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/identica-mode/files/50identica-mode-gentoo.el b/app-emacs/identica-mode/files/50identica-mode-gentoo.el
new file mode 100644
index 000000000000..e2ecd33d5bff
--- /dev/null
+++ b/app-emacs/identica-mode/files/50identica-mode-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'identica "identica-mode" "Start identica-mode." t)
diff --git a/app-emacs/identica-mode/identica-mode-1.1-r1.ebuild b/app-emacs/identica-mode/identica-mode-1.1-r1.ebuild
new file mode 100644
index 000000000000..c2f01e7d5778
--- /dev/null
+++ b/app-emacs/identica-mode/identica-mode-1.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Identi.ca mode for Emacs"
+HOMEPAGE="http://blog.nethazard.net/identica-mode-for-emacs/"
+# taken from: http://git.savannah.gnu.org/cgit/identica-mode.git/snapshot/${P}.tar.gz
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-apps/texinfo"
+
+ELISP_TEXINFO="doc/${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_postinst() {
+ elisp-site-regen
+ elog "You may optionally set username and password in your ~/.emacs file:"
+ elog " (setq identica-username \"yourusername\")"
+ elog " (setq identica-password \"yourpassword\")"
+}
diff --git a/app-emacs/identica-mode/metadata.xml b/app-emacs/identica-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/identica-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/igrep-2.113 b/app-emacs/igrep-2.113
deleted file mode 100644
index 88d14a24d711..000000000000
--- a/app-emacs/igrep-2.113
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An improved interface to "grep" and "find"
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/GrepMode
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/igrep-2.113.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=2b6be75021c3acb0ce6c42aac099a505
diff --git a/app-emacs/igrep/Manifest b/app-emacs/igrep/Manifest
new file mode 100644
index 000000000000..070d7f3b9393
--- /dev/null
+++ b/app-emacs/igrep/Manifest
@@ -0,0 +1,4 @@
+AUX 50igrep-gentoo.el 1173 BLAKE2B 681d9a26295a34f20707b776792e77eb97015a661d06957390a6c6c5aebf4bd5babadc238b1923bfe22adb12aa75e20e4bced88669e09fd22c34b6f9a877e8c8 SHA512 404abf4e786145b276c6dddfefc1d335e4f941e7f8b77fae3668bd7028330f4ee3a19e8940c94e0a7a32cd90813787bcc3317011f1430f084698f2b97f465f7f
+DIST igrep-2.113.tar.bz2 10662 BLAKE2B fa854e1975548e037f33ce97988b9e4abf8182c13f6cce804a8b305e03282fc7990cccc2061aa3ed829279721f13610b89e2a4125b637d0584ccfd28ba628d0b SHA512 60ca8fa09cb2aa02ec7178afc7d8a2a6d98ebd98b951b29c9c7150588d5ca0dbf01e23e77c6524e2ce510466bd17aba607a172efde1fb4bc56e8478a752d5ff1
+EBUILD igrep-2.113.ebuild 362 BLAKE2B 6b3313b4a34c99ef34b2eb9c28a2ff7b6433a5e69df9b2d7f7031a5672fa0bc21b5017ffcf18e9de7bfd31f8306a7f0dc2d2105b9d8298159c0b30919890b39d SHA512 c0ca991c1a657beabb0f098e5ea3f70a446af9487947b2e9c16503bdba9673a03e46e04e614eb56439a3657a8a1078881fe472b3a59b2418f21d85784032482d
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/igrep/files/50igrep-gentoo.el b/app-emacs/igrep/files/50igrep-gentoo.el
new file mode 100644
index 000000000000..5b44e5f88d5b
--- /dev/null
+++ b/app-emacs/igrep/files/50igrep-gentoo.el
@@ -0,0 +1,33 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'igrep "igrep"
+ "*Run `grep` PROGRAM to match EXPRESSION in FILES..." t)
+(autoload 'igrep-find "igrep"
+ "*Run `grep` via `find`..." t)
+(autoload 'igrep-visited-files "igrep"
+ "*Run `grep` ... on all visited files." t)
+(autoload 'dired-do-igrep "igrep"
+ "*Run `grep` on the marked (or next prefix ARG) files." t)
+(autoload 'dired-do-igrep-find "igrep"
+ "*Run `grep` via `find` on the marked (or next prefix ARG) directories." t)
+(autoload 'Buffer-menu-igrep "igrep"
+ "*Run `grep` on the files visited in buffers marked with '>'." t)
+(autoload 'igrep-insinuate "igrep"
+ "Define `grep' aliases for the corresponding `igrep' commands." t)
+(autoload 'grep "igrep"
+ "*Run `grep` PROGRAM to match EXPRESSION in FILES..." t)
+(autoload 'egrep "igrep"
+ "*Run `egrep`..." t)
+(autoload 'fgrep "igrep"
+ "*Run `fgrep`..." t)
+(autoload 'agrep "igrep"
+ "*Run `agrep`..." t)
+(autoload 'grep-find "igrep"
+ "*Run `grep` via `find`..." t)
+(autoload 'egrep-find "igrep"
+ "*Run `egrep` via `find`..." t)
+(autoload 'fgrep-find "igrep"
+ "*Run `fgrep` via `find`..." t)
+(autoload 'agrep-find "igrep"
+ "*Run `agrep` via `find`..." t)
+
diff --git a/app-emacs/igrep/igrep-2.113.ebuild b/app-emacs/igrep/igrep-2.113.ebuild
new file mode 100644
index 000000000000..132d1f208cd0
--- /dev/null
+++ b/app-emacs/igrep/igrep-2.113.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION='An improved interface to "grep" and "find"'
+HOMEPAGE="https://www.emacswiki.org/emacs/GrepMode"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/igrep/metadata.xml b/app-emacs/igrep/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/igrep/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/inform-mode-1.5.8 b/app-emacs/inform-mode-1.5.8
deleted file mode 100644
index db8ea55762bd..000000000000
--- a/app-emacs/inform-mode-1.5.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A major mode for editing Inform programs
-EAPI=5
-HOMEPAGE=https://www.rupert-lane.org/inform-mode/ https://www.emacswiki.org/emacs/InformMode
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/inform-mode-1.5.8.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=a045f24f1cbc21e6f787c7bd312c30e6
diff --git a/app-emacs/inform-mode-1.6.2 b/app-emacs/inform-mode-1.6.2
deleted file mode 100644
index 26eee65f3122..000000000000
--- a/app-emacs/inform-mode-1.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A major mode for editing Inform programs
-EAPI=5
-HOMEPAGE=https://www.rupert-lane.org/inform-mode/ https://www.emacswiki.org/emacs/InformMode
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://rupert-lane.org/inform-mode/releases/inform-mode-1.6.2.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=be7a165f2831b3f2c45a191c88d8ce06
diff --git a/app-emacs/inform-mode/Manifest b/app-emacs/inform-mode/Manifest
new file mode 100644
index 000000000000..7dfca250d7e5
--- /dev/null
+++ b/app-emacs/inform-mode/Manifest
@@ -0,0 +1,6 @@
+AUX 50inform-mode-gentoo.el 303 BLAKE2B f6146e84023b468b4ed32ede21673a1e1c1cce4057c00811f8aced3440e0fb3e91cac9dc62ae7a3eed654d7781ddc8d9ac028b53dc6bc5e0c43750224c3238f2 SHA512 e3a9b79ce99c8d0a6d9e67430610b12fd90d081f99c4066f46044359f06bf429cea6899ef99f9ef10d04799adc0338a983fdc344caf1f208d5c505f1ed163606
+DIST inform-mode-1.5.8.tar.bz2 14734 BLAKE2B 9ffae6571786109ae324e6d1336c453b279f5ef7d8b8be7561fd062cbe71f106c0d2b3e1065fadb7a153942fd5ad9db9d763652912a021cfc66ff2a0a16da3ed SHA512 edf073d1c4f60ec9eb186a68cafff22ad67a32f40f21bd89584f3a02eada6d073935892e761a6a2f2726e90f59cf0c1a77c2cd59b8b4e85a17374f47997265d8
+DIST inform-mode-1.6.2.tar.gz 33359 BLAKE2B 5ea2a31443db436e3230b61d4f8cf6a724f0103857ce98b41becf2271956e1aba2dbacc73b47be20ca347314c1be186d99a1884d11ce14a7cbce6944096ad588 SHA512 41ab2353942a5d605ec848aed87aa731282a43305cd739fe76d9e6ddd333c84594455f0fb72d95ed02fbcfa9f78f11b16ea8bb579504d1ed29244cbe50e444ee
+EBUILD inform-mode-1.5.8.ebuild 430 BLAKE2B 6a939a2f2e5a02408c9762e82aae3dc4ab4b9ec0ada4d586a50c926b71ca9b806683edfbea6ff0eaf8f91cc9b5ee0e1974f8b20dcb287aa8d08eab8416e74a28 SHA512 902e367bdae123204b63e42c1cbaccf9527a5d46f400967accf0d9771fbefe462b1154982e318ad19f13a71c997e53a93d60cfff30f493d4c7142729cac11308
+EBUILD inform-mode-1.6.2.ebuild 461 BLAKE2B a0527399bd3efa43169dfb557d55211c436b79a51c688c4fb867505004d6eb3430fb19fb34caaa2a74509805c4d031eb22573f0d406f486caf9929cffae40f5a SHA512 efe9e22e0aa93561b3a4285f7b734526ebe1f602c265e63d74c98ca88d6e64a91e805173c42527828cdc0f2e43511681dc4d259ad3ab3704ce98dc16ccb8e309
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/inform-mode/files/50inform-mode-gentoo.el b/app-emacs/inform-mode/files/50inform-mode-gentoo.el
new file mode 100644
index 000000000000..503578664549
--- /dev/null
+++ b/app-emacs/inform-mode/files/50inform-mode-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'inform-mode "inform-mode" "Inform editing mode." t)
+(autoload 'inform-maybe-mode "inform-mode" "Inform/C header editing mode.")
+(add-to-list 'auto-mode-alist '("\\.h\\'" . inform-maybe-mode))
+(add-to-list 'auto-mode-alist '("\\.inf\\'" . inform-mode))
diff --git a/app-emacs/inform-mode/inform-mode-1.5.8.ebuild b/app-emacs/inform-mode/inform-mode-1.5.8.ebuild
new file mode 100644
index 000000000000..d4a55833934d
--- /dev/null
+++ b/app-emacs/inform-mode/inform-mode-1.5.8.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A major mode for editing Inform programs"
+HOMEPAGE="https://www.rupert-lane.org/inform-mode/
+ https://www.emacswiki.org/emacs/InformMode"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+
+S="${WORKDIR}/${PN}"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/inform-mode/inform-mode-1.6.2.ebuild b/app-emacs/inform-mode/inform-mode-1.6.2.ebuild
new file mode 100644
index 000000000000..748c923a19a3
--- /dev/null
+++ b/app-emacs/inform-mode/inform-mode-1.6.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A major mode for editing Inform programs"
+HOMEPAGE="https://www.rupert-lane.org/inform-mode/
+ https://www.emacswiki.org/emacs/InformMode"
+SRC_URI="http://rupert-lane.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="AUTHORS NEWS README"
diff --git a/app-emacs/inform-mode/metadata.xml b/app-emacs/inform-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/inform-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/initsplit-1.7_pre20140203 b/app-emacs/initsplit-1.7_pre20140203
deleted file mode 100644
index 6fb07e3139dc..000000000000
--- a/app-emacs/initsplit-1.7_pre20140203
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Split customizations into different files
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/InitSplit
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/initsplit-1.7_pre20140203.el.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=39bc0b72bb5d1f177ef5d2f39a831f93
diff --git a/app-emacs/initsplit/Manifest b/app-emacs/initsplit/Manifest
new file mode 100644
index 000000000000..caf46266d2fb
--- /dev/null
+++ b/app-emacs/initsplit/Manifest
@@ -0,0 +1,4 @@
+AUX 50initsplit-gentoo.el 91 BLAKE2B 7948d846c2baf3d9b7ef84ebce76ff2088545a1a7452bee7f80316a72fda6551a99108b07e650332e504bd457dbe144212f9e138f32322ebde24e86d9794d093 SHA512 531d0f480c3787453b182be3b9fe145fffd9752155b2c26df3fdf0b497cd058f5978687df53e43046c1f44f4908679783756377998f49dc407a6e18956bc34b1
+DIST initsplit-1.7_pre20140203.el.xz 4792 BLAKE2B eb853870e9d159129e22e48dd5704b83fe8877933ab68f75127e4c82000b7a2a3b87ccd779f16f2ed2b0407ed6574694e42310fd6195152adb099bfd5c592187 SHA512 f2c894bb9d0359b5e95760541feb83f465950de732266059b9498b7ee7361ebb843e0d900fec92fa5e9c37547ea160836b9fc24f64c56083e3ea4416b4b52e50
+EBUILD initsplit-1.7_pre20140203.ebuild 752 BLAKE2B 66ad22ef605d5be57f68ee0a88cc84c238391b2290fda63d4260646708b5f349fd50d72e1d3ace914764c1c8419d5ac993444db775e792e1a9b7728abf286048 SHA512 36b7489e6f7e71eff22dfcd55776d1fda82bae3acbcd2cf2d7a3b01d51c4c6b81da5bad31ee3dc52485543569eccb075a9a93d321197b3d588d67666892cfd5c
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/initsplit/files/50initsplit-gentoo.el b/app-emacs/initsplit/files/50initsplit-gentoo.el
new file mode 100644
index 000000000000..dbc698522304
--- /dev/null
+++ b/app-emacs/initsplit/files/50initsplit-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'initsplit-byte-compile-files "initsplit")
diff --git a/app-emacs/initsplit/initsplit-1.7_pre20140203.ebuild b/app-emacs/initsplit/initsplit-1.7_pre20140203.ebuild
new file mode 100644
index 000000000000..9638e25e032e
--- /dev/null
+++ b/app-emacs/initsplit/initsplit-1.7_pre20140203.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+DESCRIPTION="Split customizations into different files"
+HOMEPAGE="https://www.emacswiki.org/emacs/InitSplit"
+# taken from https://github.com/dabrahams/${PN}
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="Initsplit is not enabled as a site default. Add the following
+ line to your ~/.emacs file to enable configuration file splitting:
+ \n\t(load \"initsplit\")
+ \n\nIf you want configuration files byte-compiled, also add this line:
+ \n\t(add-hook 'after-save-hook 'initsplit-byte-compile-files t)"
diff --git a/app-emacs/initsplit/metadata.xml b/app-emacs/initsplit/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/initsplit/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/jam-mode-0.3 b/app-emacs/jam-mode-0.3
deleted file mode 100644
index 01192f21ba71..000000000000
--- a/app-emacs/jam-mode-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Emacs major mode for editing Jam files
-EAPI=5
-HOMEPAGE=https://web.archive.org/web/20100211015821/http://www.tenfoot.org.uk/index.html
-KEYWORDS=alpha amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/jam-mode-0.3.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=7f003f9c0bf4cfc216bdaa8892280813
diff --git a/app-emacs/jam-mode/Manifest b/app-emacs/jam-mode/Manifest
new file mode 100644
index 000000000000..0063e27f5ff0
--- /dev/null
+++ b/app-emacs/jam-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50jam-mode-gentoo.el 212 BLAKE2B 96f36555e9e01dd648dca4b5171d3ed6a15c6615a0043a50eb894c2f104ab720d72dea9df910d424cc179bcd4a7435de3044c9f23a5a265a86693135d20ebb51 SHA512 b94b3478da71eadda96667167920b1841b233efae73b6b986bbb15eddcd57d97d26d7a57a42c5e99399a67122595950ec73b7b499984075cb2f208b0b9f3fad6
+DIST jam-mode-0.3.el.xz 3368 BLAKE2B 53b701a8580c29e2a4ebc705f79b4eb312f8466a9ec7c721adbdd243a812ba25e1dda0bfd32a4ca84453b4ccf19ac2cfaaed54269d80e05da62deece18761d9e SHA512 17cfbbc2a1e65f65d3a2366a861ada2133e4a16f2c9a99b40915a3c50744dcb4360226a7ec9efc53092731389a3b397df92764b79240f203a5ef6c132c5c9350
+EBUILD jam-mode-0.3.ebuild 475 BLAKE2B 0e45e6b9d0348faa7f4264a43330c5109acc483af0d94b6ff8ef892ba3525559d84d6895807fa6d257e63452b6d243a9d67d161a9a54198abdb154e136c7ee86 SHA512 f8a322df0f6bff6f54568ba34f0daa9eebc12d4ab16774f32bd58d675041a69ec3375b25fc7ed83877415140c31005fb26f2290dbf597119c151917bad42e394
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/jam-mode/files/50jam-mode-gentoo.el b/app-emacs/jam-mode/files/50jam-mode-gentoo.el
new file mode 100644
index 000000000000..33b7d29cb59b
--- /dev/null
+++ b/app-emacs/jam-mode/files/50jam-mode-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'jam-mode "jam-mode" "Generic mode for Jam rules files" t)
+(add-to-list
+ 'auto-mode-alist
+ '("\\(\\.jam\\|[Jj]ambase\\|[Jj]amfile\\|[Jj]amrules\\)\\'" . jam-mode))
diff --git a/app-emacs/jam-mode/jam-mode-0.3.ebuild b/app-emacs/jam-mode/jam-mode-0.3.ebuild
new file mode 100644
index 000000000000..1b66a84b7cce
--- /dev/null
+++ b/app-emacs/jam-mode/jam-mode-0.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Emacs major mode for editing Jam files"
+HOMEPAGE="https://web.archive.org/web/20100211015821/http://www.tenfoot.org.uk/index.html"
+# taken from http://www.tenfoot.org.uk/emacs/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/jam-mode/metadata.xml b/app-emacs/jam-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/jam-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/jasmin-1.2-r2 b/app-emacs/jasmin-1.2-r2
deleted file mode 100644
index 729f1cfe1cae..000000000000
--- a/app-emacs/jasmin-1.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Emacs major mode for editing Jasmin Java bytecode assembler files
-EAPI=5
-HOMEPAGE=http://www.neilvandyke.org/jasmin-emacs/
-KEYWORDS=alpha amd64 ~s390 x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/jasmin-1.2.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=55ee0f378d2394e57dc540ef76d8c14f
diff --git a/app-emacs/jasmin/Manifest b/app-emacs/jasmin/Manifest
new file mode 100644
index 000000000000..a448d28caabd
--- /dev/null
+++ b/app-emacs/jasmin/Manifest
@@ -0,0 +1,4 @@
+AUX 50jasmin-gentoo.el 196 BLAKE2B e805e71db29dd32229ffd902df0fc7618ed12af55c173d8252a5de3c3e908f8d7084b812e7f3e568a9864902fa7a9d5e5bf87705f28469822faaace31a963af8 SHA512 b9923ea9814aa46af4fdc7f9e23bb4cc7f19f2521aa449f53192f0c0ec543a7f83409f315a06138e1e4f861f0e2b457a96547401598d718c86c29ad00e56dd40
+DIST jasmin-1.2.tar.gz 9287 BLAKE2B 2ddc69f61662c66a58c9422a43d88642fea79d678942138d7c7e79276e2c322c3af5b17d82728ce7fdcf7501a171d9c8199b671cf6ac7511bd0e126fd73b2a67 SHA512 2b89fad8e4bdfe71f09af8f2a31347cc63ad6c70008b33500e85d58c0ec872076229d9113170c54f57c969940cb2973b6167e2b7f825a94c1d3f55680f419043
+EBUILD jasmin-1.2-r2.ebuild 394 BLAKE2B eebe23b8a847dbd136eccf9d2aa68731b246c3f7334efb09bdc855dd10def4ab091f04238d6abdd5e73d99827f32701a29427aae3f38a4b371319b376d2b8013 SHA512 ea627a0e3cc0d317ec96c08e8191a5ac26b4dbee7169b5bd2f1e770775e51a6c13e6e711a9b5ba84495f80d0c068cd63e73d4b87fea5ef30057c7a967ed5803e
+MISC metadata.xml 594 BLAKE2B 68e378186827c101434838f84ddbcb68bf6bd1145318d8af8aa5048f2b884d8ca8397513a99e8dcc951ec38b8c7d3262690c7a9deafa52bfd624978b069740ea SHA512 1aad6c493f1df6c407b93362202eae1efc081c863c4f6f5b1b5fd729f091876db72d295630e01f5a9f10697aa64c17898a80ff90fe872b8a732f1855c4ee14ac
diff --git a/app-emacs/jasmin/files/50jasmin-gentoo.el b/app-emacs/jasmin/files/50jasmin-gentoo.el
new file mode 100644
index 000000000000..1c4f67d8ecb2
--- /dev/null
+++ b/app-emacs/jasmin/files/50jasmin-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'jasmin-mode "jasmin"
+ "Major mode for editing Jasmin Java bytecode assembler files." t)
+(add-to-list 'auto-mode-alist '("\\.j\\'" . jasmin-mode))
diff --git a/app-emacs/jasmin/jasmin-1.2-r2.ebuild b/app-emacs/jasmin/jasmin-1.2-r2.ebuild
new file mode 100644
index 000000000000..fcd840340b0c
--- /dev/null
+++ b/app-emacs/jasmin/jasmin-1.2-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Emacs major mode for editing Jasmin Java bytecode assembler files"
+HOMEPAGE="http://www.neilvandyke.org/jasmin-emacs/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 ~s390 x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/jasmin/metadata.xml b/app-emacs/jasmin/metadata.xml
new file mode 100644
index 000000000000..522cddbdba91
--- /dev/null
+++ b/app-emacs/jasmin/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ jasmin.el is an Emacs major mode for editing Jasmin Java bytecode
+ assembler files. It provides automatic formatting, customizable
+ fontifying, and quick-reference syntax help. Font-lock specifications
+ are derived from an encoded grammar, for detailed syntax coloring.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/jde-2.4.1 b/app-emacs/jde-2.4.1
deleted file mode 100644
index 73febb5ee7e4..000000000000
--- a/app-emacs/jde-2.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.3 app-emacs/elib dev-java/bsh:0 dev-java/junit:0 dev-util/checkstyle:0 dev-java/ant-contrib:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 >=virtual/emacs-23
-DESCRIPTION=Java Development Environment for Emacs
-EAPI=5
-HOMEPAGE=http://jdee.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=>=virtual/jdk-1.3 app-emacs/elib dev-java/bsh:0 dev-java/junit:0 dev-util/checkstyle:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/jdee-2.4.1.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-ant-2 ea15ab9e838d1062abd6b53de2045d50 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c9da711d9544abd501f08ca0b643ee4e
diff --git a/app-emacs/jde/Manifest b/app-emacs/jde/Manifest
new file mode 100644
index 000000000000..0e58d625bcbb
--- /dev/null
+++ b/app-emacs/jde/Manifest
@@ -0,0 +1,7 @@
+AUX 70jde-gentoo.el 406 BLAKE2B 236be929cb339aedb7025d80eacb0a548b72c50e04ce0020d8a4b99b87886a3a7f32bdde004b8d18cc7328f5b32766589b8b8780a22693fa8f14d0f7c7d1cb23 SHA512 9d7f65d67d897272c4aa24e3fa77abd217b077561d391ccec8181838d4e162f9086f95fb724ee9bba3bdd44f954f14d67c044ebd78a059a69bc0f12c03c0fc28
+AUX jde-2.4.0.1-classpath-gentoo.patch 2291 BLAKE2B 6eed82127107933d274218e72f052ab1d4b2a737f36ad0834b88724d2c9dc550f8480966fddaad902e5b63c98c98135ceb77cc7820fa0d1512dbe6607a69f6e6 SHA512 c18378500f04b2f6cbed5c4a20d03600ea01174faf93d460c1ea274c50ca95891096f49e471160255e4ec27cda2330ee6c28fe29e96633994c3d5f910876f848
+AUX jde-2.4.0.1-fix-paths-gentoo.patch 7175 BLAKE2B ee0e51e50afb1bcd86432f6546a0b2105a987b3b8a616dd88a21817667f362eb554bf6f6af41f3b0efe409654e4a3a6ea85f4f753e7c668081fad79228ce73f7 SHA512 179e6bd8cc0165ee1f0d3383aec76bdb97f6164562663fe577a9ef04ac236afeccf1137594d7d4d8962ce4577befeb81e393d03c08bf68473657de7e18debb7e
+AUX jde-2.4.1-doc-directory.patch 1806 BLAKE2B 6e13265c71beb4247aba97ddb05f7b500822f7a8f619c40dca229533497c101b93ee6d891a3c85e51f9d56f39b2fec229c44f922f1bc2d79b3b5942bed6913a5 SHA512 3818474077c2f387bdef6fb297a40b94529622e1da3fb31c3d7b3734111fb4e607062f9cdca9f1f5b020dec8d8e9e6601d5bf7831a20415f393f2f029e97c101
+DIST jdee-2.4.1.tar.xz 2742232 BLAKE2B f022cb55583acc7846bc04b59e843050947819c6bb2494bbe08ac3895c15d914df28d3c3a50cfd945efa7ed507cda9906a42866c85463907544095377cc1bf07 SHA512 5ce5f0f84b2502e9af808f33210511e8b7682902b1f342d678fe42dd8f9f3690b90ef7bb22583550eb769818782c50f545d6baf47b52bc7f4502fab411ab5359
+EBUILD jde-2.4.1.ebuild 1927 BLAKE2B aa4f4fb0fbc30ede2114af07bfcd0741ba564dd7b2ec0ef469e35b69aa205975806972470eade33a762bfb69b7a64d097cf8c4aa13c6e21ac019125b2e128b66 SHA512 f4f872602931287fcad579c2b1a15267c07419b3a4822988ec888d861292b86d5ede7dc5882d398b4b3aaa1c363ada64becbc812efcd4b19182f88a37a04a3d4
+MISC metadata.xml 990 BLAKE2B eb71dd15e27fb4154809b13e3df660a6cf678de66ba2943194e00121c6076835cafd9b7d6f05a11a11338fc1938f5222ee1edf4cc1d38e3c8db9a2de2361bba4 SHA512 52b53b824f57a5bed2920e3f2f48c6706a26e7e0f4f2e4bfe36ca62a244fe02c1f24daff67e01b4615f84b96911a404e7cd578e7670516914069c65f7508471e
diff --git a/app-emacs/jde/files/70jde-gentoo.el b/app-emacs/jde/files/70jde-gentoo.el
new file mode 100644
index 000000000000..c7fff6a61b4d
--- /dev/null
+++ b/app-emacs/jde/files/70jde-gentoo.el
@@ -0,0 +1,10 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'jde-autoload)
+
+(setq jde-java-directory "/usr/share/jde")
+(setq jde-bsh-jar-file "@BSH_JAR@")
+(setq jde-checkstyle-jar-file "@CHECKSTYLE_JAR@")
+(setq jde-checkstyle-style "/usr/share/checkstyle/checks/sun_checks.xml")
+(setq jde-html-directory "/usr/share/doc/@PF@/html")
+(setq bsh-html-directory "/usr/share/doc/@PF@/html")
+(setq jde-check-version-flag nil)
diff --git a/app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch b/app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch
new file mode 100644
index 000000000000..47fdd4e11e47
--- /dev/null
+++ b/app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch
@@ -0,0 +1,69 @@
+Initialise classpath for beanshell and checkstyle using java-config.
+Gentoo specific patch.
+
+--- jde-orig/lisp/beanshell.el
++++ jde/lisp/beanshell.el
+@@ -809,6 +809,14 @@
+ "BeanShell intended to be used independently of any other
+ Emacs package.")
+
++(defun bsh-get-gentoo-classpath ()
++ (or bsh-classpath
++ (with-temp-buffer
++ (call-process "java-config" nil t nil "-d" "-p" "bsh")
++ (skip-chars-backward "\n")
++ (setq bsh-classpath
++ (split-string (buffer-substring (point-min) (point)) ":+")))))
++
+ (defmethod initialize-instance ((this bsh-standalone-bsh) &rest fields)
+ "Constructor for the standard bsh BeanShell instance."
+ (call-next-method)
+@@ -845,7 +853,7 @@
+ bsh-vm)
+ (executable-find (if (eq system-type 'windows-nt) "javaw" "java"))))
+
+- (oset this cp bsh-classpath)
++ (oset this cp (bsh-get-gentoo-classpath))
+
+ (oset this startup-dir bsh-startup-directory))
+
+--- jde-orig/lisp/jde-bsh.el
++++ jde/lisp/jde-bsh.el
+@@ -187,7 +187,7 @@
+ (jde-get-tools-jar)
+ (if ant-home (expand-file-name "lib" ant-home)))
+ (jde-pi-get-bsh-classpath)
+- bsh-classpath
++ (bsh-get-gentoo-classpath)
+ (jde-expand-classpath (jde-get-global-classpath)))))))
+
+ ;; Create the BeanShell wrapper object.
+--- jde-orig/lisp/jde-checkstyle.el
++++ jde/lisp/jde-checkstyle.el
+@@ -305,6 +305,14 @@
+ (format "-D%s=%s" (car prop) (cdr prop)))
+ jde-checkstyle-expanded-properties))
+
++(defun jde-checkstyle-get-gentoo-classpath ()
++ (or jde-checkstyle-classpath
++ (with-temp-buffer
++ (call-process "java-config" nil t nil "-d" "-p" "checkstyle")
++ (skip-chars-backward "\n")
++ (setq jde-checkstyle-classpath
++ (split-string (buffer-substring (point-min) (point)) ":+")))))
++
+ (defmethod jde-checkstyle-exec ((this jde-checkstyle-checker))
+
+ (jde-checkstyle-create-checker-buffer this)
+@@ -327,9 +335,8 @@
+ (jde-checkstyle-get-property-args this))
+ (oref this :interactive-args)
+ (list "-classpath"
+- (if jde-checkstyle-classpath
+- (jde-build-classpath jde-checkstyle-classpath)
+- (jde-normalize-path jde-checkstyle-jar-file)))
++ (jde-build-classpath
++ (jde-checkstyle-get-gentoo-classpath)))
+ (list jde-checkstyle-class)
+ (list "-c"
+ (if jde-checkstyle-style
diff --git a/app-emacs/jde/files/jde-2.4.0.1-fix-paths-gentoo.patch b/app-emacs/jde/files/jde-2.4.0.1-fix-paths-gentoo.patch
new file mode 100644
index 000000000000..a129b588587c
--- /dev/null
+++ b/app-emacs/jde/files/jde-2.4.0.1-fix-paths-gentoo.patch
@@ -0,0 +1,218 @@
+Make paths of directories and jar files configurable.
+
+Part of this patch was taken from Debian and heavily modified, see:
+http://patch-tracking.debian.net/patch/series/view/jde/2.3.5.1-5/0005-Set-the-location-of-needed-files-for-beanshell.el-an.patch
+
+--- jde-orig/lisp/beanshell.el
++++ jde/lisp/beanshell.el
+@@ -891,14 +891,21 @@
+
+ (add-to-list 'auto-mode-alist '("\\.bsh\\'" . bsh-script-mode))
+
++(defcustom bsh-html-directory
++ (let ((jde-dir (jde-find-jde-doc-directory)))
++ (if jde-dir
++ (expand-file-name "doc/html/bsh-ug" jde-dir)))
++ "Directory of the beanshell HTML documentation."
++ :group 'bsh
++ :type 'directory)
++
+ ;;;###autoload
+ (defun bsh-script-help ()
+ "Display BeanShell User's Guide."
+ (interactive)
+- (let* ((jde-dir (jde-find-jde-doc-directory))
+- (bsh-help
+- (if jde-dir
+- (expand-file-name "doc/html/bsh-ug/bsh-ug.html" jde-dir))))
++ (let ((bsh-help
++ (if bsh-html-directory
++ (expand-file-name "bsh-ug.html" bsh-html-directory))))
+ (if (and
+ bsh-help
+ (file-exists-p bsh-help))
+--- jde-orig/lisp/jde-bsh.el
++++ jde/lisp/jde-bsh.el
+@@ -91,22 +91,59 @@
+ "The single instance of the JDEE's BeanShell."))
+ "Class of JDEE BeanShells. There is only one per Emacs session.")
+
++(defcustom jde-java-directory
++ (expand-file-name "java" (jde-find-jde-data-directory))
++ "Top-level directory of JDE Java files."
++ :group 'jde-project
++ :type 'directory)
++
++(defcustom jde-bsh-commands-directory
++ (expand-file-name "bsh-commands" jde-java-directory)
++ "Directory of beanshell commands."
++ :group 'bsh
++ :type 'directory)
++
++(defcustom jde-classes-directory
++ (expand-file-name "classes" jde-java-directory)
++ "Directory of JDE classes."
++ :group 'jde-project
++ :type 'directory)
++
++(defcustom jde-checkstyle-jar-file
++ (expand-file-name "lib/checkstyle-all.jar" jde-java-directory)
++ "Path of the checkstyle-jar file."
++ :group 'jde-project
++ :type 'file)
++
++(defcustom jde-regexp-jar-file
++ (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory)
++ "Path of the regexp-jar file."
++ :group 'jde-project
++ :type 'file)
++
++(defcustom jde-jde-jar-file
++ (expand-file-name "lib/jde.jar" jde-java-directory)
++ "Path of the jde-jar file."
++ :group 'jde-project
++ :type 'file)
++
++(defcustom jde-bsh-jar-file
++ (expand-file-name "lib/bsh.jar" jde-java-directory)
++ "Path of the bsh-jar file."
++ :group 'jde-project
++ :type 'file)
++
+ (defmethod initialize-instance ((this jde-bsh) &rest fields)
+ "Constructor for the JDEE BeanShell instance."
+ (call-next-method)
+- (let* ((jde-java-directory
+- (concat
+- (jde-find-jde-data-directory)
+- "java/")))
+-
+- (oset this bsh-cmd-dir (expand-file-name "bsh-commands" jde-java-directory))
+- (oset this checkstyle-jar (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))
+- (oset this regexp-jar (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory))
+- (oset this jde-classes-dir (expand-file-name "classes" jde-java-directory))
+- (oset this jde-jar (expand-file-name "lib/jde.jar" jde-java-directory))
+- (oset this jar (expand-file-name "lib/bsh.jar" jde-java-directory))
+- (oset this separate-error-buffer jde-bsh-separate-buffer)
+- (oset-default 'jde-bsh the-bsh this)))
++ (oset this bsh-cmd-dir jde-bsh-commands-directory)
++ (oset this checkstyle-jar jde-checkstyle-jar-file)
++ (oset this regexp-jar jde-regexp-jar-file)
++ (oset this jde-classes-dir jde-classes-directory)
++ (oset this jde-jar jde-jde-jar-file)
++ (oset this jar jde-bsh-jar-file)
++ (oset this separate-error-buffer jde-bsh-separate-buffer)
++ (oset-default 'jde-bsh the-bsh this))
+
+ (defmethod bsh-create-buffer ((this jde-bsh))
+ "Creates the JDEE's beanshell buffer."
+@@ -150,6 +187,7 @@
+ (jde-get-tools-jar)
+ (if ant-home (expand-file-name "lib" ant-home)))
+ (jde-pi-get-bsh-classpath)
++ bsh-classpath
+ (jde-expand-classpath (jde-get-global-classpath)))))))
+
+ ;; Create the BeanShell wrapper object.
+--- jde-orig/lisp/jde-bug.el
++++ jde/lisp/jde-bug.el
+@@ -2438,10 +2438,10 @@
+ (defun jde-bug-help ()
+ "Displays the JDEbug User's Guide."
+ (interactive)
+- (let* ((jde-dir (jde-find-jde-doc-directory))
+- (jdebug-help
+- (if jde-dir
+- (expand-file-name "doc/html/jdebug-ug/jdebug-ug.html" jde-dir))))
++ (let ((jdebug-help
++ (if jde-html-directory
++ (expand-file-name "jdebug-ug/jdebug-ug.html"
++ jde-html-directory))))
+ (if (and
+ jdebug-help
+ (file-exists-p jdebug-help))
+--- jde-orig/lisp/jde-checkstyle.el
++++ jde/lisp/jde-checkstyle.el
+@@ -322,10 +322,6 @@
+ (vm-path (oref (jde-run-get-vm) :path))
+ (source-file
+ (concat (file-name-nondirectory buffer-file-name)))
+- (jde-java-directory
+- (concat
+- (jde-find-jde-data-directory)
+- "java/"))
+ (args (append
+ (unless jde-checkstyle-expanded-properties-file
+ (jde-checkstyle-get-property-args this))
+@@ -333,13 +329,13 @@
+ (list "-classpath"
+ (if jde-checkstyle-classpath
+ (jde-build-classpath jde-checkstyle-classpath)
+- (jde-normalize-path
+- (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))))
++ (jde-normalize-path jde-checkstyle-jar-file)))
+ (list jde-checkstyle-class)
+ (list "-c"
+ (if jde-checkstyle-style
+ (jde-normalize-path jde-checkstyle-style)
+- (concat (jde-find-jde-data-directory) "java/lib/sun_checks.xml")))
++ (expand-file-name "lib/sun_checks.xml"
++ jde-java-directory)))
+ (if jde-checkstyle-expanded-properties-file
+ (list "-p" (jde-normalize-path jde-checkstyle-expanded-properties-file)))
+ (if jde-checkstyle-module-package-names-file
+--- jde-orig/lisp/jde-dbs.el
++++ jde/lisp/jde-dbs.el
+@@ -907,9 +907,6 @@
+ (jde-normalize-path 'jde-run-working-directory)
+ source-directory))
+ (vm (oref (jde-run-get-vm) :path))
+- (jde-java-directory
+- (expand-file-name "java"
+- (jde-find-jde-data-directory)))
+ (vm-args
+ (let (args)
+ (setq args
+--- jde-orig/lisp/jde.el
++++ jde/lisp/jde.el
+@@ -1722,14 +1722,19 @@
+ jde.el."
+ (jde-find-jde-data-directory))
+
++(defcustom jde-html-directory
++ (expand-file-name "doc/html" (jde-find-jde-doc-directory))
++ "Directory of the JDE HTML documentation."
++ :group 'jde-project
++ :type 'directory)
++
+ ;;;###autoload
+ (defun jde-show-help ()
+ "Displays the JDE User's Guide in a browser."
+ (interactive)
+- (let* ((jde-dir (jde-find-jde-doc-directory))
+- (jde-help
+- (if jde-dir
+- (expand-file-name "doc/html/jde-ug/jde-ug.html" jde-dir))))
++ (let ((jde-help
++ (if jde-html-directory
++ (expand-file-name "jde-ug/jde-ug.html" jde-html-directory))))
+ (if (and
+ jde-help
+ (file-exists-p jde-help))
+--- jde-orig/lisp/jde-jdb.el
++++ jde/lisp/jde-jdb.el
+@@ -1459,10 +1459,10 @@
+
+ (defun jde-jdb-help ()
+ (interactive)
+- (let* ((jde-dir (jde-find-jde-doc-directory))
+- (jdb-ug-path
+- (if jde-dir
+- (expand-file-name "doc/html/jdb-ug/jdb-ug-frame.html" jde-dir))))
++ (let ((jdb-ug-path
++ (if jde-html-directory
++ (expand-file-name "jdb-ug/jdb-ug-frame.html"
++ jde-html-directory))))
+ (if (and
+ jdb-ug-path
+ (file-exists-p jdb-ug-path))
diff --git a/app-emacs/jde/files/jde-2.4.1-doc-directory.patch b/app-emacs/jde/files/jde-2.4.1-doc-directory.patch
new file mode 100644
index 000000000000..c96fcd861594
--- /dev/null
+++ b/app-emacs/jde/files/jde-2.4.1-doc-directory.patch
@@ -0,0 +1,53 @@
+Move definition of jde-find-jde-doc-directory to jde-util.el.
+
+--- jdee-orig/lisp/beanshell.el
++++ jdee/lisp/beanshell.el
+@@ -82,7 +82,7 @@
+ (eval-when-compile
+ (require 'cl))
+
+-(declare-function jde-find-jde-doc-directory "jde" nil)
++(require 'jde-util)
+
+ (defgroup bsh nil
+ "Customizations for the Emacs inteface to Pat Neimeyer's Java
+--- jdee-orig/lisp/jde-util.el
++++ jdee/lisp/jde-util.el
+@@ -139,6 +139,17 @@
+ (if dir dir (jde-root)))
+ (jde-root))))
+
++(defun jde-find-jde-doc-directory ()
++ "Return the path of the JDE documentation directory.
++Returns nil if the directory cannot be found. At some
++point, XEmacs will include the JDE. Versions of XEmacs
++that include JDE will store the JDE doc in a data
++directory called jde. On all other Emacs versions, the JDE
++expects to find the documentation in a subdirectory
++named doc of the directory that contains the file
++jde.el."
++ (jde-find-jde-data-directory))
++
+ (defun jde-temp-directory ()
+ "Get the location used by the host system to store temporary files."
+ (or (if (boundp 'temporary-file-directory) temporary-file-directory)
+--- jdee-orig/lisp/jde.el
++++ jdee/lisp/jde.el
+@@ -1762,17 +1762,6 @@
+
+
+ ;; JDE help
+-(defun jde-find-jde-doc-directory ()
+- "Return the path of the JDE documentation directory.
+-Returns nil if the directory cannot be found. At some
+-point, XEmacs will include the JDE. Versions of XEmacs
+-that include JDE will store the JDE doc in a data
+-directory called jde. On all other Emacs versions, the JDE
+-expects to find the documentation in a subdirectory
+-named doc of the directory that contains the file
+-jde.el."
+- (jde-find-jde-data-directory))
+-
+ (defcustom jde-html-directory
+ (expand-file-name "doc/html" (jde-find-jde-doc-directory))
+ "Directory of the JDE HTML documentation."
diff --git a/app-emacs/jde/jde-2.4.1.ebuild b/app-emacs/jde/jde-2.4.1.ebuild
new file mode 100644
index 000000000000..fd50b7af19da
--- /dev/null
+++ b/app-emacs/jde/jde-2.4.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 elisp eutils
+
+DESCRIPTION="Java Development Environment for Emacs"
+HOMEPAGE="http://jdee.sourceforge.net/"
+# snapshot of svn://svn.code.sf.net/p/jdee/code/branches/2.4.1 (rev 292)
+# (upstream's distfile misses build.xml)
+SRC_URI="mirror://gentoo/jdee-${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+RDEPEND=">=virtual/jdk-1.3
+ app-emacs/elib
+ dev-java/bsh:0
+ dev-java/junit:0
+ dev-util/checkstyle:0"
+DEPEND="${RDEPEND}
+ dev-java/ant-contrib:0"
+
+S="${WORKDIR}/jdee-${PV}"
+SITEFILE="70${PN}-gentoo.el"
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ elisp_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.4.0.1-fix-paths-gentoo.patch"
+ epatch "${FILESDIR}/${PN}-2.4.0.1-classpath-gentoo.patch"
+ epatch "${FILESDIR}/${PN}-2.4.1-doc-directory.patch"
+
+ local bshjar csjar
+ bshjar=$(java-pkg_getjar --build-only bsh bsh.jar) || die
+ csjar=$(java-pkg_getjar --build-only checkstyle checkstyle.jar) || die
+ sed -e "s:@BSH_JAR@:${bshjar}:;s:@CHECKSTYLE_JAR@:${csjar}:" \
+ -e "s:@PF@:${PF}:" "${FILESDIR}/${SITEFILE}" >"${SITEFILE}" || die
+
+ cd java/lib || die
+ java-pkg_jar-from --build-only checkstyle checkstyle.jar checkstyle-all.jar
+ java-pkg_jar-from junit
+ java-pkg_jar-from bsh
+}
+
+src_compile() {
+ ANT_TASKS="ant-contrib" \
+ eant -Delib.dir="${EPREFIX}${SITELISP}/elib" \
+ bindist $(usex doc source-doc "")
+}
+
+src_install() {
+ local dist="dist/jdee-${PV%_*}"
+
+ java-pkg_dojar ${dist}/java/lib/jde.jar
+ insinto "${JAVA_PKG_SHAREPATH}"
+ doins -r java/bsh-commands
+
+ use source && java-pkg_dosrc java/src/*
+ use doc && java-pkg_dojavadoc ${dist}/doc/java/api
+
+ elisp-install ${PN} ${dist}/lisp/*.{el,elc}
+ elisp-site-file-install "${SITEFILE}"
+
+ dobin ${dist}/lisp/jtags
+
+ dohtml -r doc/html/*
+}
diff --git a/app-emacs/jde/metadata.xml b/app-emacs/jde/metadata.xml
new file mode 100644
index 000000000000..3c127a28363d
--- /dev/null
+++ b/app-emacs/jde/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 type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
+<longdescription>
+ The Java Development Environment for Emacs is a software package
+ that interfaces Emacs to command-line Java development tools (for
+ example, JavaSoft's JDK). JDEE features include:
+
+ * JDEE menu with compile, run, debug, build, browse, project, and
+ help commands
+ * syntax coloring
+ * auto indentation
+ * compile error to source links
+ * source-level debugging
+ * source code browsing
+ * make file support
+ * automatic code generation
+ * Java source interpreter (Pat Neimeyer's BeanShell)
+</longdescription>
+<upstream>
+ <remote-id type="sourceforge">jdee</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/keywiz-1.4 b/app-emacs/keywiz-1.4
deleted file mode 100644
index 06a1e91af95c..000000000000
--- a/app-emacs/keywiz-1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs key sequence quiz
-EAPI=5
-HOMEPAGE=http://www.phys.au.dk/~harder/
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/keywiz-1.4.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=4da1db7778a8decef98ca926f9c9fc7a
diff --git a/app-emacs/keywiz/Manifest b/app-emacs/keywiz/Manifest
new file mode 100644
index 000000000000..7ba02ed8c01f
--- /dev/null
+++ b/app-emacs/keywiz/Manifest
@@ -0,0 +1,4 @@
+AUX 50keywiz-gentoo.el 90 BLAKE2B cb67da854b03e94a27da7659c0c7140e737ac8c1799cd44d6accc60c6e43c3291e7077532226781b1e3a716f7b3e720258e6261656c1160783551a0a8fbab488 SHA512 8c2416bb1ab1286273bb591eb545acd15b74b88e7925f06f8756abbc227f3bfb88e67d8af489169405cf4fa28ba6c366fbf9851db61b3f8a90723889f624f988
+DIST keywiz-1.4.tar.gz 4159 BLAKE2B 85498eb95194fcdc20589791d48b49ffba77982c310654fad133a6ed096a290ef75ec6983cf492e80153c8c967bb8271c059140bd8353b743ced86887a7cbf61 SHA512 e6143562a7bdba6ceb838e56504dcbcf9d975be04af28007cfd6e79a5fdcb4028882f1e2fd57e4245b47b80dd5234bcb7ddc2eef4ab0c09bb80483f9db7eca19
+EBUILD keywiz-1.4.ebuild 332 BLAKE2B 9f13787dcf71fc77f56220c68964a3a300f38d6f2dba3a53db6e0341a796e844f924e2c08b6bcc9a3e10444dd3e8c3ba7d205943111a05cd68bc75c08c5a9973 SHA512 de6b7dfb1f7a6dfa9a6a116169997e355a69b4172bbc4c3ad32f793c979dc9218a5e1524ba89ac54001355321fb7edfd8cbf3da550875ffdcd9d586ce0ebdef9
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/keywiz/files/50keywiz-gentoo.el b/app-emacs/keywiz/files/50keywiz-gentoo.el
new file mode 100644
index 000000000000..91621c829e9e
--- /dev/null
+++ b/app-emacs/keywiz/files/50keywiz-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'keywiz "keywiz" "Autoload for keywiz" t)
diff --git a/app-emacs/keywiz/keywiz-1.4.ebuild b/app-emacs/keywiz/keywiz-1.4.ebuild
new file mode 100644
index 000000000000..6b7840694976
--- /dev/null
+++ b/app-emacs/keywiz/keywiz-1.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Emacs key sequence quiz"
+HOMEPAGE="http://www.phys.au.dk/~harder/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/keywiz/metadata.xml b/app-emacs/keywiz/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/keywiz/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/limit-1.14.10_pre200811252332 b/app-emacs/limit-1.14.10_pre200811252332
deleted file mode 100644
index 4e887f203240..000000000000
--- a/app-emacs/limit-1.14.10_pre200811252332
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/apel-10.3 >=virtual/emacs-23
-DESCRIPTION=Library about Internet Message, for IT generation
-EAPI=5
-HOMEPAGE=http://git.chise.org/elisp/flim/
-KEYWORDS=alpha amd64 ppc sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=app-emacs/apel-10.3 !app-emacs/flim >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.jpl.org/ftp/pub/m17n/limit-1_14-200811252332.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=6eec88c5fb38c4949bd613f609043927
diff --git a/app-emacs/limit/Manifest b/app-emacs/limit/Manifest
new file mode 100644
index 000000000000..f8995c67d3ec
--- /dev/null
+++ b/app-emacs/limit/Manifest
@@ -0,0 +1,4 @@
+AUX 60flim-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST limit-1_14-200811252332.tar.gz 186477 BLAKE2B ccc9ac2f95e2cc27dd82fad215ab15f8cab8bbd92aa009f7d47a11f727bbf2c50a67797e76d9830fee0d84b1ee0bd1a5dd01ded877dc77695a49058b541680e6 SHA512 59cce771747cc1e144cf5b3e043c87b09f81935334327a1ea46197951f2c572c3f3e28efc71076fd3da54f9f667852574088ab009d2e966ea3eb363ee53ce0a0
+EBUILD limit-1.14.10_pre200811252332.ebuild 906 BLAKE2B a87283818a11456acdabbe4bd0b75265d9abd1a379f9b7799e3f65d837b514d9c6b54caf98194889ecd221b789b2d46dff0ebca18f9b113b502d78bdf2261d2a SHA512 1c3fc5aad95091be0eb428f6166e7f60262388e2465da7fb5f6937949d9512939554d7e499505233a3393ddb232379755fbbf70bcb6773b7cab40ca7badfa81e
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/limit/files/60flim-gentoo.el b/app-emacs/limit/files/60flim-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/limit/files/60flim-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/limit/limit-1.14.10_pre200811252332.ebuild b/app-emacs/limit/limit-1.14.10_pre200811252332.ebuild
new file mode 100644
index 000000000000..310cf269edde
--- /dev/null
+++ b/app-emacs/limit/limit-1.14.10_pre200811252332.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+MY_PV="${PV/./_}"; MY_PV="${MY_PV/.*_pre/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Library about Internet Message, for IT generation"
+HOMEPAGE="http://git.chise.org/elisp/flim/"
+SRC_URI="http://www.jpl.org/ftp/pub/m17n/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86"
+
+DEPEND=">=app-emacs/apel-10.3"
+RDEPEND="${DEPEND}
+ !app-emacs/flim"
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="60flim-gentoo.el"
+
+src_compile() {
+ emake PREFIX="${D}/usr" \
+ LISPDIR="${D}/${SITELISP}" \
+ VERSION_SPECIFIC_LISPDIR="${D}/${SITELISP}"
+}
+
+src_install() {
+ emake PREFIX="${D}/usr" \
+ LISPDIR="${D}/${SITELISP}" \
+ VERSION_SPECIFIC_LISPDIR="${D}/${SITELISP}" install
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ dodoc FLIM-API.en NEWS VERSION README* ChangeLog
+}
diff --git a/app-emacs/limit/metadata.xml b/app-emacs/limit/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/limit/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/lookup-1.4.1 b/app-emacs/lookup-1.4.1
deleted file mode 100644
index e0abb77f9e4f..000000000000
--- a/app-emacs/lookup-1.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An interface to search CD-ROM books and network dictionaries
-EAPI=4
-HOMEPAGE=http://openlab.jp/edict/lookup/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://openlab.jp/edict/lookup/dist/lookup-1.4.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=138414fe428b9584a9e019f2d9beb70d
diff --git a/app-emacs/lookup/Manifest b/app-emacs/lookup/Manifest
new file mode 100644
index 000000000000..d157df7cfd89
--- /dev/null
+++ b/app-emacs/lookup/Manifest
@@ -0,0 +1,5 @@
+AUX 50lookup-gentoo.el 155 BLAKE2B b6b3c5a64fc880aa261a632d8f14f8bc6cd1e94b9d0f03ede917fc4eb88a6203d71a0d71a92c4ce51080adf54f7740397038378f631ad1a7dc6dab126f1b8189 SHA512 021e3bd99a25974788966d840cf5ce9359447c1aa331b9ef517aef23c4dc79581539bfd61a5f35f92551a4c189a64867fbf173212d28172e379da3532c1a9694
+AUX lookup-1.4.1-garbage-char.patch 283 BLAKE2B f69000bc367024bb71d14e5d687b4159f810779a524712870e3f25ebbb1db8711b7d94495659e0faee46bf640a7d2707a921f07a181155d542d8d9fc1f67dc55 SHA512 7e338e2184454579f2e5675e9b969805bd8954fa51fa55a42b62a58094f1f9a1760f1430cb61916bdfd999428f06705f555b6325c993edad7b119e7083325e11
+DIST lookup-1.4.1.tar.gz 346391 BLAKE2B 4de52e0bf444e4822408db580f1aacbeb8a42ea1492eda2c7678f1838615da00a370b1d12efdf0ff1fef4e81302426245e0c2411f42bf17667966c90f8b39cbb SHA512 a28a770ba58f07db5a7b2452792fc0e83b74e3b45556e84a9729c73773df661dbb7d356c1f7be803feb66f23e154aa825dab610f841bbe655bc76bd7120370bf
+EBUILD lookup-1.4.1.ebuild 720 BLAKE2B 713e5e5ac686f549a819c1b596e750ea632e81f1b2bf0ae7bccbed89f5c3c02c933111ae6a08db4eba69ea52b75cf907bf37244e3c383004a72fd53bf09e0f1b SHA512 b03163a1cc77f9e926d04e9260748e64f17aa434d011aa13f1c88123064feba5cb922edc8b06e7a15c2411a5bbeaf0d530c41c56f106ad6237243c61f5e80173
+MISC metadata.xml 375 BLAKE2B 022df13d1d586579ed08af80b893ce2a1a9d1275720ec5d447efca002dd05a5544eaa6c1f01a5d6df2c0e7cf594eacf6a0c1fb840989674f8af537e1468ec6ee SHA512 24ea62246bc2d2c433dd071cf9906fe2f0c9dd834ba4d5bfadbbefcb9d47a063cd07da9c6756043c296c2ae56da39f18714416dab862d5f36fbd2f6100dc663b
diff --git a/app-emacs/lookup/files/50lookup-gentoo.el b/app-emacs/lookup/files/50lookup-gentoo.el
new file mode 100644
index 000000000000..9ae8d93a847c
--- /dev/null
+++ b/app-emacs/lookup/files/50lookup-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'lookup "lookup" nil t)
+(autoload 'lookup-region "lookup" nil t)
+(autoload 'lookup-pattern "lookup" nil t)
diff --git a/app-emacs/lookup/files/lookup-1.4.1-garbage-char.patch b/app-emacs/lookup/files/lookup-1.4.1-garbage-char.patch
new file mode 100644
index 000000000000..7c9a3bea9152
--- /dev/null
+++ b/app-emacs/lookup/files/lookup-1.4.1-garbage-char.patch
@@ -0,0 +1,8 @@
+--- lookup-1.4.1-orig/lisp/ndic.el
++++ lookup-1.4.1/lisp/ndic.el
+@@ -1,4 +1,4 @@
+-e;;; ndic.el --- Lookup by free dictionaries
++;;; ndic.el --- Lookup by free dictionaries
+ ;; Copyright (C) 1999 Lookup Development Team <lookup@ring.gr.jp>
+
+ ;; Author: Keisuke Nishida <kei@psn.net>
diff --git a/app-emacs/lookup/lookup-1.4.1.ebuild b/app-emacs/lookup/lookup-1.4.1.ebuild
new file mode 100644
index 000000000000..77d227163e10
--- /dev/null
+++ b/app-emacs/lookup/lookup-1.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="An interface to search CD-ROM books and network dictionaries"
+HOMEPAGE="http://openlab.jp/edict/lookup/"
+SRC_URI="http://openlab.jp/edict/lookup/dist/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+ELISP_PATCHES="${P}-garbage-char.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+ econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}"
+}
+
+src_compile() {
+ # parallel make fails with Emacs deadlock
+ emake -j1
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/app-emacs/lookup/metadata.xml b/app-emacs/lookup/metadata.xml
new file mode 100644
index 000000000000..c59c7fc25206
--- /dev/null
+++ b/app-emacs/lookup/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/lua-mode-20130419 b/app-emacs/lua-mode-20130419
deleted file mode 100644
index a5d707dc7b0e..000000000000
--- a/app-emacs/lua-mode-20130419
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Emacs major mode for editing Lua scripts
-EAPI=5
-HOMEPAGE=http://lua-users.org/wiki/LuaEditorSupport
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/immerrr/lua-mode/archive/rel-20130419.tar.gz -> lua-mode-20130419.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=bf62c2abcc45a2aed3d8e436a84ccafd
diff --git a/app-emacs/lua-mode/Manifest b/app-emacs/lua-mode/Manifest
new file mode 100644
index 000000000000..3acf13512066
--- /dev/null
+++ b/app-emacs/lua-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50lua-mode-gentoo.el 206 BLAKE2B 07efd36ded1a442c754102c22bea97ee4bffc2c89e40fbef2d8e644051766da13da6b0d2034f3a4e27fa1522949ff351a1105651d79d9005bf38dddd4bea6577 SHA512 b062343ab77dcaa50355498a63681c8e5bc6f209b1aa5ef82d65be8c19aa52d58c2efcd481f091804726b095a02b97de5b6cbce232ee5d9f328c5e3d888b496b
+DIST lua-mode-20130419.tar.gz 26242 BLAKE2B 25f75c70982ba2fb0077fb249501367f9dde3eee5ff7bb45c0d8d97857b6268c481652e06e5a92bd04d9b9fcac0fa3368dfbdc3efcbaefc34268aeb490ac6ad9 SHA512 e66ebe6c953e81b07a8f9d86264b1baa5e0b730a6d26b1acf7fb48ceb8cc0f008cdea0046d89e380fefefe0e0b189ef360280236befc79ade69e0622a2e7eb92
+EBUILD lua-mode-20130419.ebuild 565 BLAKE2B 9faa92c7ffb730378c151855a9e539351555d60d4cf5c15373a6edeffd20d15baa77291d89c6c8539a67ebd4613c22a3f7ccde70858f887224f60b8e30e1dad4 SHA512 2657979d911f672874d24633694e690455f365cee764d33a7c70db2730134c9f108acf9acaa5fa494b2bc36bf248e415ab9f675d10d0bcbf0c21bbc8667fbd0d
+MISC metadata.xml 361 BLAKE2B 4953692a3d3c19f162a539ae4167f16289c569f8c379e09f46423556bb8bf5335e95c5a125a29fcabdbf762405920a4d97c4920c304560688d617be0badcb69a SHA512 e7d96df1fb7a061ecba903b1e2ee997a93801e8d367f7b7b6c1394a8366f05e4fe001d96a08496559f16187ad93d21055b93a52ab4afce9631a179635e4e78d1
diff --git a/app-emacs/lua-mode/files/50lua-mode-gentoo.el b/app-emacs/lua-mode/files/50lua-mode-gentoo.el
new file mode 100644
index 000000000000..b1385e489c8d
--- /dev/null
+++ b/app-emacs/lua-mode/files/50lua-mode-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'lua-mode "lua-mode" "Mode for editing Lua scripts" t)
+(add-to-list 'auto-mode-alist '("\\.lua\\'" . lua-mode))
+(setq lua-default-application "/usr/bin/lua")
diff --git a/app-emacs/lua-mode/lua-mode-20130419.ebuild b/app-emacs/lua-mode/lua-mode-20130419.ebuild
new file mode 100644
index 000000000000..aa0543fbc7ac
--- /dev/null
+++ b/app-emacs/lua-mode/lua-mode-20130419.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Emacs major mode for editing Lua scripts"
+HOMEPAGE="http://lua-users.org/wiki/LuaEditorSupport"
+SRC_URI="https://github.com/immerrr/${PN}/archive/rel-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${PN}-rel-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="NEWS README README.md TODO"
diff --git a/app-emacs/lua-mode/metadata.xml b/app-emacs/lua-mode/metadata.xml
new file mode 100644
index 000000000000..a2bc19c27f39
--- /dev/null
+++ b/app-emacs/lua-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">immerrr/lua-mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/lyskom-elisp-client-0.48_p20131231 b/app-emacs/lyskom-elisp-client-0.48_p20131231
deleted file mode 100644
index dd980410438c..000000000000
--- a/app-emacs/lyskom-elisp-client-0.48_p20131231
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Elisp client for the LysKOM conference system
-EAPI=5
-HOMEPAGE=http://www.lysator.liu.se/lyskom/klienter/emacslisp/index.en.html
-IUSE=l10n_sv
-KEYWORDS=amd64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/lyskom-elisp-client-0.48_p20131231.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e1a9ad17c414c2328fd5e2e97114c3c9
diff --git a/app-emacs/lyskom-elisp-client-0.48_p20161231 b/app-emacs/lyskom-elisp-client-0.48_p20161231
deleted file mode 100644
index 68eca6343e2d..000000000000
--- a/app-emacs/lyskom-elisp-client-0.48_p20161231
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Elisp client for the LysKOM conference system
-EAPI=6
-HOMEPAGE=http://www.lysator.liu.se/lyskom/klienter/emacslisp/index.en.html
-IUSE=l10n_sv
-KEYWORDS=amd64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/lyskom-elisp-client-0.48_p20161231.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=fb4b47d61f1b02648354ebe2ce153ca3
diff --git a/app-emacs/lyskom-elisp-client-0.48_p20180410 b/app-emacs/lyskom-elisp-client-0.48_p20180410
deleted file mode 100644
index 0fc7e58c90b8..000000000000
--- a/app-emacs/lyskom-elisp-client-0.48_p20180410
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=virtual/emacs-23
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=Elisp client for the LysKOM conference system
-EAPI=7
-HOMEPAGE=http://www.lysator.liu.se/lyskom/klienter/emacslisp/index.en.html
-IUSE=l10n_sv
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/lyskom-elisp-client-0.48_p20180410.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=716263613285495fcc5b1f2717b692ab
diff --git a/app-emacs/lyskom-elisp-client/Manifest b/app-emacs/lyskom-elisp-client/Manifest
new file mode 100644
index 000000000000..b2cfb98b28c3
--- /dev/null
+++ b/app-emacs/lyskom-elisp-client/Manifest
@@ -0,0 +1,9 @@
+AUX 50lyskom-elisp-client-gentoo.el 83 BLAKE2B fc6ddc15aefba06dab5ab19d3c3bfbe071c14ffc1a486330f728e3af89d0b457ab7a1c4ccd633da575acff1effbc4f7f7649279365850339b31a13982c296027 SHA512 f7e3f23ecbadc1fde023a6cd176e45719affaa6f03a015c3d399719c53cb4f56ea7269d725ac0fffcc9311fc8e8ed1fd0d3de93f0d1973a2abdcd14b073389ce
+AUX lyskom-elisp-client-0.48_p20161231-no-git.patch 898 BLAKE2B 77719e2cf527fd91e7fd122b7474a588231948113acf7b999dd4d6e7229ed3b9768d76932cadd2a6227f7474322e7cda68cd4a3493ab33536b99dea68eb05240 SHA512 3e0e9df1388af428dde8ba879beefb62fd261a557d6bf5b6fac59311029bfc613a1c407059ed533949fccb77aa99e0815a23116286895ff8ea33c5462e66095c
+DIST lyskom-elisp-client-0.48_p20131231.tar.xz 888212 BLAKE2B 54bcd028a8adc51aeedd8f8e8940b391d06bfda389c3ce776c113a2f1fe738d5d46a5332bba07c708dc38b06f6c4d6feff3328a4ff10bce1c22dd9c73d6bf349 SHA512 124dc45194d68588535e134acae9de9b19484b568c43d2eb49d3c4e8ee923e0baf64a634181a3238f34cf59a98a5a1e92e988519d26e8f3c3a0e867f500d53e9
+DIST lyskom-elisp-client-0.48_p20161231.tar.xz 889464 BLAKE2B fda0de6e335c0f50dd8ca78c45ea161ce1e8290beba54567c1352609f9f5b1fd69be5d651b33ed89e6a19a52665954e80cb22dfafbf8d396d87bef735114f528 SHA512 f412a0b1b9f71be26ac511f66ba5215e757287baa668ce71802802eb13f907137fe27a96614c58abac510104c1d9558cf9b62b3bf8e598c11b4fa3bc33269f81
+DIST lyskom-elisp-client-0.48_p20180410.tar.xz 889468 BLAKE2B b8a1766b6f6b1d4b01676792f45d66517cdc43d2e29ae6e5b0704b90e4dfc749f8e4155159fd28a25426d79502bcaf7f2cbded32b2e64e22b2b36f11cbdbd123 SHA512 efb04b2100d59fac971898a6db3e48cf45e3bdc4455f06a0cdd065a97db5441edd4eda2e838a5e88c0b0246387dba0e3f71777892b3a6889c51960f0259fbdfc
+EBUILD lyskom-elisp-client-0.48_p20131231.ebuild 1017 BLAKE2B 3b787c1bbc84f6c879b7af861e570278d2ffac065ac614ac00c2e37037d45a4e8ada8630d8c3c94153492101f9ebd311dff83cf0c10e5d679eeba2b64eed1d06 SHA512 79cd45680c7b09cf7883923de6cdd30d15b8fd3c1b7102d7e2760e8772817d30dca276df173bb14b24f208b3f209f3abccd50c05310c728b8fd695c247baec58
+EBUILD lyskom-elisp-client-0.48_p20161231.ebuild 1181 BLAKE2B eb4639a4e1ffd8efeaf5929eb2470bb56d044bb2c1ef2b0a5069b0109914b6f026bf56c7c4f645257727a6a39fc7e2116fe9db7368f7ad67388367140c9755f1 SHA512 ca99f1f79abc1c179a849907a935d826994d467b060b6362d1e551a624d905a0e616fdb4d35cdca698776356e8943ad007c0006518f20fc6471c5e8bc2d67f7c
+EBUILD lyskom-elisp-client-0.48_p20180410.ebuild 1199 BLAKE2B f3f79b5ae59444d8618d7ab131cc7fbe55476254e6da2bd437e389b796ca7681c7aa17bc8268a28b95ac07af6a4d0081ecc35087f57f1641f59b5201f7d3a7bc SHA512 feed06df76225b2a2e1857c6b93ff513f54ce20c3fa4c686a4120efe836e0880c7b5d6c5ee760e3e659dc3a4d0f982614e20504f7155f1831d10c45296bb63bb
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/lyskom-elisp-client/files/50lyskom-elisp-client-gentoo.el b/app-emacs/lyskom-elisp-client/files/50lyskom-elisp-client-gentoo.el
new file mode 100644
index 000000000000..8625986f64b6
--- /dev/null
+++ b/app-emacs/lyskom-elisp-client/files/50lyskom-elisp-client-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'lyskom "lyskom" "Start LysKOM" t)
diff --git a/app-emacs/lyskom-elisp-client/files/lyskom-elisp-client-0.48_p20161231-no-git.patch b/app-emacs/lyskom-elisp-client/files/lyskom-elisp-client-0.48_p20161231-no-git.patch
new file mode 100644
index 000000000000..53ae30abacc2
--- /dev/null
+++ b/app-emacs/lyskom-elisp-client/files/lyskom-elisp-client-0.48_p20161231-no-git.patch
@@ -0,0 +1,20 @@
+--- lyskom-elisp-client-orig/src/Makefile
++++ lyskom-elisp-client/src/Makefile
+@@ -41,7 +41,7 @@
+ # Also remember to change version number in ../doc/Makefile!
+ LASTRELEASE = 0.48
+ NEXTRELEASE = 0.49
+-CLIENTVERSION = $(shell (git describe --exact-match --tags HEAD 2>/dev/null || git describe --tags --match 'v*' --dirty) | sed -e 's/^v//' -e 's/-/-devbuild-/')
++CLIENTVERSION = unknown
+
+ ######################################################################
+
+@@ -155,7 +155,7 @@
+
+ version.el: version.el.in Makefile $(HEADER1) $(HEADER2) $(LANGUAGE-EL) $(SOURCES)
+ rm -f $@
+- sed "s/@@CLIENTVERSION@@/$(LASTRELEASE) (`date +%Y-%m-%d`; Git `git rev-parse --short HEAD``git diff --quiet HEAD||echo '*'`)/g" <$< >$@
++ sed "s/@@CLIENTVERSION@@/$(LASTRELEASE) (@@DATE@@; Git *)/g" <$< >$@
+ chmod 444 $@
+
+ version.el-release: version.el.in Makefile $(HEADER1) $(HEADER2) $(LANGUAGE-EL) $(SOURCES)
diff --git a/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20131231.ebuild b/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20131231.ebuild
new file mode 100644
index 000000000000..5d037934fe8d
--- /dev/null
+++ b/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20131231.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+DESCRIPTION="Elisp client for the LysKOM conference system"
+HOMEPAGE="http://www.lysator.liu.se/lyskom/klienter/emacslisp/index.en.html"
+# snapshot of git://git.lysator.liu.se/${PN}/${PN}.git
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 sparc x86"
+IUSE="l10n_sv"
+
+S="${WORKDIR}/${PN}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ emake -C src EMACS=emacs
+ # Info page is in Swedish only
+ use l10n_sv && emake -C doc elisp-client
+}
+
+src_install() {
+ elisp-install ${PN} src/lyskom.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc src/{ChangeLog*,README,TODO} doc/NEWS*
+ use l10n_sv && doinfo doc/elisp-client
+
+ DOC_CONTENTS="If you prefer an English language environment, add the
+ following line to your ~/.emacs file:
+ \n\t(setq-default kom-default-language 'en)"
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20161231.ebuild b/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20161231.ebuild
new file mode 100644
index 000000000000..e332db5a7723
--- /dev/null
+++ b/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20161231.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Elisp client for the LysKOM conference system"
+HOMEPAGE="http://www.lysator.liu.se/lyskom/klienter/emacslisp/index.en.html"
+# snapshot of git://git.lysator.liu.se/${PN}/${PN}.git
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+IUSE="l10n_sv"
+
+S="${WORKDIR}/${PN}"
+ELISP_PATCHES="${P}-no-git.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+ local d=${PV#*_p}
+ sed -i "s/@@DATE@@/${d:0:4}-${d:4:2}-${d:6:2}/" src/Makefile || die
+}
+
+src_compile() {
+ emake -C src EMACS=emacs
+ # Info page is in Swedish only
+ use l10n_sv && emake -C doc elisp-client
+}
+
+src_install() {
+ elisp-install ${PN} src/lyskom.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc src/{ChangeLog*,README,TODO} doc/NEWS*
+ use l10n_sv && doinfo doc/elisp-client
+
+ DOC_CONTENTS="If you prefer an English language environment, add the
+ following line to your ~/.emacs file:
+ \n\t(setq-default kom-default-language 'en)"
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20180410.ebuild b/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20180410.ebuild
new file mode 100644
index 000000000000..ad8068bd1ab9
--- /dev/null
+++ b/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20180410.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Elisp client for the LysKOM conference system"
+HOMEPAGE="http://www.lysator.liu.se/lyskom/klienter/emacslisp/index.en.html"
+# snapshot of git://git.lysator.liu.se/${PN}/${PN}.git
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="l10n_sv"
+
+S="${WORKDIR}/${PN}"
+ELISP_PATCHES="${PN}-0.48_p20161231-no-git.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+ local d=${PV#*_p}
+ sed -i "s/@@DATE@@/${d:0:4}-${d:4:2}-${d:6:2}/" src/Makefile || die
+}
+
+src_compile() {
+ emake -C src EMACS=emacs
+ # Info page is in Swedish only
+ use l10n_sv && emake -C doc elisp-client
+}
+
+src_install() {
+ elisp-install ${PN} src/lyskom.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc src/{ChangeLog*,README,TODO} doc/NEWS*
+ use l10n_sv && doinfo doc/elisp-client
+
+ DOC_CONTENTS="If you prefer an English language environment, add the
+ following line to your ~/.emacs file:
+ \n\t(setq-default kom-default-language 'en)"
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/lyskom-elisp-client/metadata.xml b/app-emacs/lyskom-elisp-client/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/lyskom-elisp-client/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/magit-2.11.0 b/app-emacs/magit-2.11.0
deleted file mode 100644
index 7852e484ec85..000000000000
--- a/app-emacs/magit-2.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.6.0 sys-apps/texinfo >=virtual/emacs-24
-DESCRIPTION=A Git porcelain inside Emacs
-EAPI=6
-HOMEPAGE=https://magit.vc/
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=>=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.6.0 >=dev-vcs/git-1.9.4 >=virtual/emacs-24
-SLOT=0
-SRC_URI=https://github.com/magit/magit/archive/2.11.0.tar.gz -> magit-2.11.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=d7b232295cabdb038b52aace0aa4a4df
diff --git a/app-emacs/magit-2.12.1 b/app-emacs/magit-2.12.1
deleted file mode 100644
index 214c7c64b75c..000000000000
--- a/app-emacs/magit-2.12.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/dash-2.13.0 >=app-emacs/ghub-2.0.0 >=app-emacs/magit-popup-2.12.3 >=app-emacs/with-editor-2.7.2 sys-apps/texinfo >=virtual/emacs-24
-DESCRIPTION=A Git porcelain inside Emacs
-EAPI=6
-HOMEPAGE=https://magit.vc/
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=>=app-emacs/dash-2.13.0 >=app-emacs/ghub-2.0.0 >=app-emacs/magit-popup-2.12.3 >=app-emacs/with-editor-2.7.2 >=dev-vcs/git-1.9.4 >=virtual/emacs-24
-SLOT=0
-SRC_URI=https://github.com/magit/magit/archive/2.12.1.tar.gz -> magit-2.12.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=ff69ab48044599e15a8b5f19ff2cb828
diff --git a/app-emacs/magit-2.13.0 b/app-emacs/magit-2.13.0
deleted file mode 100644
index 1897bc110d27..000000000000
--- a/app-emacs/magit-2.13.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/ghub-2.0.1 >=app-emacs/magit-popup-2.12.3 >=app-emacs/with-editor-2.7.3 sys-apps/texinfo >=virtual/emacs-24
-DESCRIPTION=A Git porcelain inside Emacs
-EAPI=6
-HOMEPAGE=https://magit.vc/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/ghub-2.0.1 >=app-emacs/magit-popup-2.12.3 >=app-emacs/with-editor-2.7.3 >=dev-vcs/git-1.9.4 >=virtual/emacs-24
-SLOT=0
-SRC_URI=https://github.com/magit/magit/archive/2.13.0.tar.gz -> magit-2.13.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=39a046bcc9e958ac95e4ada36927cbe6
diff --git a/app-emacs/magit-popup-2.12.3 b/app-emacs/magit-popup-2.12.3
deleted file mode 100644
index d50668c7ace0..000000000000
--- a/app-emacs/magit-popup-2.12.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/dash-2.13.0 sys-apps/texinfo >=virtual/emacs-24
-DESCRIPTION=Define prefix-infix-suffix command combos
-EAPI=6
-HOMEPAGE=https://magit.vc/manual/magit-popup
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=virtual/emacs-24
-SLOT=0
-SRC_URI=https://github.com/magit/magit-popup/archive/v2.12.3.tar.gz -> magit-popup-2.12.3.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=e15638e635397d241590b5c40e48a642
diff --git a/app-emacs/magit-popup/Manifest b/app-emacs/magit-popup/Manifest
new file mode 100644
index 000000000000..cad250249e49
--- /dev/null
+++ b/app-emacs/magit-popup/Manifest
@@ -0,0 +1,4 @@
+AUX 50magit-popup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST magit-popup-2.12.3.tar.gz 40195 BLAKE2B a351e949207b674c734f66b0431fa4c137293ccff880e3f457dfb825d7a36afd37f59197170a86d52606d371c181cd8a23be54d74aeee192a2d1a56588a55b3d SHA512 50620ce1d364ae28f30658dedd8f235bb1055be5cf4320142b7648e2ff6137f84cf865ea8f41e34ad7fb42612ff5d36fc0c4f6caa0aa0d2071bf775c15be5833
+EBUILD magit-popup-2.12.3.ebuild 594 BLAKE2B 4e1f7e95d6581b55aac702d4d4aed048f0ab0f9815b1d9a8dfb3688c541eadd13e39e9f9f40cb7ab931e6841f9cc9c86205d40dfff0560b8417a9764c7d12e15 SHA512 750cd4a10d07188fc9113e2e71604c3742f6d9ed02179f7cceef982fa1d4c037ef88eb4faf9ead8cc46d798cba9044c5f83cb183ceda69c110dccbd9a1d66e4a
+MISC metadata.xml 1170 BLAKE2B ab77cb475c6f77b7829a4fa62de4ab29423ed5e7531e64b60523ccf619b3e4edf4c69037d528bf3705f0de1311833445d02932d0a8b633860319ce200cadb454 SHA512 70806e5c38f43fcfe23b2eb64f818ad6d62fdacc61cb6d1be0b8aad236f766fd558592db617aeb0b41cc9330d1789339b8a3b9eefcf65f1bced7b18633cf884f
diff --git a/app-emacs/magit-popup/files/50magit-popup-gentoo.el b/app-emacs/magit-popup/files/50magit-popup-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/magit-popup/files/50magit-popup-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/magit-popup/magit-popup-2.12.3.ebuild b/app-emacs/magit-popup/magit-popup-2.12.3.ebuild
new file mode 100644
index 000000000000..84e13cac60d7
--- /dev/null
+++ b/app-emacs/magit-popup/magit-popup-2.12.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Define prefix-infix-suffix command combos"
+HOMEPAGE="https://magit.vc/manual/magit-popup"
+SRC_URI="https://github.com/magit/magit-popup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md"
+
+CDEPEND=">=app-emacs/dash-2.13.0"
+DEPEND="${CDEPEND} sys-apps/texinfo"
+RDEPEND="!!<app-emacs/magit-2.12.1
+ ${CDEPEND}"
diff --git a/app-emacs/magit-popup/metadata.xml b/app-emacs/magit-popup/metadata.xml
new file mode 100644
index 000000000000..bc9fba320bcf
--- /dev/null
+++ b/app-emacs/magit-popup/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+This package implements a generic interface for toggling switches
+and setting options and then invoking an Emacs command which does
+something with these arguments. The prototypical use is for the
+command to call an external process, passing on the arguments as
+command line arguments. But this is only one of many possible
+uses (though the one this library is optimized for).
+
+With the Emacs concept of "prefix arguments" in mind this could be
+described as "infix arguments with feedback in a buffer".
+
+Commands that set the prefix argument for the subsequent command do
+not limit what that next command could be. But entering a command
+console popup does limit the selection to the commands defined for
+that popup, and so we use the term "infix" instead of "prefix".
+</longdescription>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">magit/magit-popup</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
new file mode 100644
index 000000000000..e8aae58d73b4
--- /dev/null
+++ b/app-emacs/magit/Manifest
@@ -0,0 +1,8 @@
+AUX 50magit-gentoo.el 77 BLAKE2B 85c942a0eeb84d6d45931a318108dff2006fc38e9e9eac37e906e03619c41fce8c151417a5e3b4fd9cf8db8fd084363a5ab6ca0765ea74e9a052d409528b6c39 SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6
+DIST magit-2.11.0.tar.gz 451030 BLAKE2B e5a5301d720e927c6c81aca4c5572a9a7fda938c695738246a87c46adc00a13e94438bb18d5f33e796c798cfec7dc438632cac6e4a452cff7d6e899a67f33575 SHA512 d32abdc9e89e77f65f05cc3dbec720320bc93d9ae827604c4f90acd115e76f8d05e445a96a141fbfbe88cdacca8383615fb73bddf01e776eeb3f63a459e973b6
+DIST magit-2.12.1.tar.gz 505873 BLAKE2B 076d9c08d3cb80274f5a6259ea5593ed419a0e140cda26bc65dc0c843373dcac1627d6bf098c5bdd9f0efb6b40ff3d7b823ed328b713390ea8916303b77ffd27 SHA512 7755aea8e7d9f0b82099143a76334be4c468536bdc0becad71acc097d9cef123394144b321f30093e079fef89e30ed1e5037fc92052ba9742112a30c6d3d586e
+DIST magit-2.13.0.tar.gz 519614 BLAKE2B 4bf1eeb8db563acd69ed65ec462f9436601c042e5ecceb2c899a920dc5710f544a9218c647fddc76ca265401f0027cd67f4de0155c3f79792f8e2f46d6fb4371 SHA512 4b840e2cf4b0fd2c5bb43c70766c6675c7e0adfc9cc7eac9f35bb9632e1eb03242dbe55870bd40436b49e9f333f00dfd361bcc63fc70c3a3a2a6b3e3e64f33a7
+EBUILD magit-2.11.0.ebuild 778 BLAKE2B 97d42aab39c4f55fa9bdf9a10d385c9fb3ac29aad78972d340200aa077176287a532310ef14f7716c2f42b6cab13cee760bb83ea13edfc4743f8d7b4ff31de62 SHA512 2c3944d01b6b0689b935aaef0ff0551e8a9e304fd8d236d65747c6167e98b97eea37970be402c3880019ac72ad4895e9195955384313d07cdefe14855b8f65fa
+EBUILD magit-2.12.1.ebuild 838 BLAKE2B 6f331d506d79e6eaf72af0e7356ebef236fab9e53951f3c7bfb3ede44891d0717f622262b6e4096208d5dd45ebd3d44b2881d18de5d7cacc6100e0a8f863733a SHA512 10a3f964ad9c9c689eebc2cede09e092db9037879aa904714f0a18ea94983c76de52d8a7085110ac4a20859c5eeaf80ae30e37cd94eb9d8d9dd9cea284d412b3
+EBUILD magit-2.13.0.ebuild 840 BLAKE2B fb57094e6f463dcce9b2b0186fe0464e2c81240cbec1cb2bbb98b96a932620924a23f5701508c5cf2903c79c5ad629e8b2694c3d2c23854966e3eb8499c3e4b2 SHA512 52061b11b59b8c9427a9b29fb3818faa99e2196b7dac9a760d9055286133106ef56e7704af8e6fb84f00b67476e173ab0b0baac7b48b2a10d35ae05181c9b0c9
+MISC metadata.xml 811 BLAKE2B aa2a5aaf1024e2a75c24cad4d01622884ffde259c3a2d9869df9629741d4a19da87c5933efd2aa58a9fc0256150e8bf5e68bef99595993154cf06027f2de4b83 SHA512 ec3ade59fbba30a15b3b728f293884c9f5cf532a8ca92c984c7978b73061cbd5a7b4b1fc68af15d28990d13f50cad688d7cc8229e9e38988bdbdbcf2fbe2a900
diff --git a/app-emacs/magit/files/50magit-gentoo.el b/app-emacs/magit/files/50magit-gentoo.el
new file mode 100644
index 000000000000..87586cc7317d
--- /dev/null
+++ b/app-emacs/magit/files/50magit-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'magit-status "magit" nil t)
diff --git a/app-emacs/magit/magit-2.11.0.ebuild b/app-emacs/magit/magit-2.11.0.ebuild
new file mode 100644
index 000000000000..06a49379de7b
--- /dev/null
+++ b/app-emacs/magit/magit-2.11.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A Git porcelain inside Emacs"
+HOMEPAGE="https://magit.vc/"
+SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${P}/lisp"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="../Documentation/*.texi"
+DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/${PV}.txt"
+
+DEPEND=">=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.6.0"
+RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
+DEPEND="${DEPEND} sys-apps/texinfo"
+
+src_prepare() {
+ default
+ echo "(setq magit-version \"${PV}\")" > magit-version.el || die
+}
diff --git a/app-emacs/magit/magit-2.12.1.ebuild b/app-emacs/magit/magit-2.12.1.ebuild
new file mode 100644
index 000000000000..8008ee12420b
--- /dev/null
+++ b/app-emacs/magit/magit-2.12.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A Git porcelain inside Emacs"
+HOMEPAGE="https://magit.vc/"
+SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${P}/lisp"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="../Documentation/*.texi"
+DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/${PV}.txt"
+
+DEPEND="
+ >=app-emacs/dash-2.13.0
+ >=app-emacs/ghub-2.0.0
+ >=app-emacs/magit-popup-2.12.3
+ >=app-emacs/with-editor-2.7.2
+"
+RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
+DEPEND="${DEPEND} sys-apps/texinfo"
+
+src_prepare() {
+ default
+ echo "(setq magit-version \"${PV}\")" > magit-version.el || die
+}
diff --git a/app-emacs/magit/magit-2.13.0.ebuild b/app-emacs/magit/magit-2.13.0.ebuild
new file mode 100644
index 000000000000..2bb11ae04844
--- /dev/null
+++ b/app-emacs/magit/magit-2.13.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A Git porcelain inside Emacs"
+HOMEPAGE="https://magit.vc/"
+SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${P}/lisp"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="../Documentation/*.texi"
+DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/${PV}.txt"
+
+DEPEND="
+ >=app-emacs/dash-2.14.1
+ >=app-emacs/ghub-2.0.1
+ >=app-emacs/magit-popup-2.12.3
+ >=app-emacs/with-editor-2.7.3
+"
+RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
+DEPEND="${DEPEND} sys-apps/texinfo"
+
+src_prepare() {
+ default
+ echo "(setq magit-version \"${PV}\")" > magit-version.el || die
+}
diff --git a/app-emacs/magit/metadata.xml b/app-emacs/magit/metadata.xml
new file mode 100644
index 000000000000..81045d73bcd1
--- /dev/null
+++ b/app-emacs/magit/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ Magit is an interface to the version control system Git, implemented as an
+ extension to Emacs.
+
+ With Magit, you can inspect and modify your Git repositories with Emacs.
+ You can review and commit the changes you have made to the tracked files,
+ for example, and you can browse the history of past changes. There is
+ support for cherry picking, reverting, merging, rebasing, and other common
+ Git operations.
+</longdescription>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">magit/magit</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/mailcrypt-3.5.9 b/app-emacs/mailcrypt-3.5.9
deleted file mode 100644
index ad631042a4db..000000000000
--- a/app-emacs/mailcrypt-3.5.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Provides a simple interface to public key cryptography with OpenPGP
-EAPI=5
-HOMEPAGE=http://mailcrypt.sourceforge.net/
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-crypt/gnupg >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/mailcrypt/mailcrypt-3.5.9.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4be673de725bdd58019ff1a000e9f362
diff --git a/app-emacs/mailcrypt/Manifest b/app-emacs/mailcrypt/Manifest
new file mode 100644
index 000000000000..2d4fc95279f6
--- /dev/null
+++ b/app-emacs/mailcrypt/Manifest
@@ -0,0 +1,4 @@
+AUX 50mailcrypt-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST mailcrypt-3.5.9.tar.gz 172073 BLAKE2B 02a911c0676464a670754cf8ddfccefa1ab9c69c680911ce63faa0affe6d3f72ad7d409f716a1edf326225f3378878caedfd4194201894baf05110d26acba533 SHA512 df6524ecc42d4c7bdddb34439186690192bc4091a1965e405223106fc71047c33e4bbbd571b030c326efec46961ba0aefd018ff1205d230dc74c34daf93ba079
+EBUILD mailcrypt-3.5.9.ebuild 900 BLAKE2B 45617c73ae1975ea32b119249b9f0fa46269849e97bf5479d77cc343bc152ac45070755ff9647338955267da4cbeb35678dcc7c535021eff5858f8a521f5c552 SHA512 ef84ff8a3cf59bfd733d4691583ad481738e73af83ca24a3b2632579607fcedf8aa0da5eff7407ed1459186ab5f6a7750e6e008793828ced6aeadb617138cb26
+MISC metadata.xml 359 BLAKE2B 115dd3e46859edda7ac4b23892ba3fd9f76e2a0aeb0f667a37c0a410959048a3a99ddbf052155fdc55bb18cc5fbd8a72af18f7c4b312ddd9f27a25c454662c9b SHA512 0a6b9ca1957a37fcdcf322663a6ae5dcfa9f00810ca7f68548acb9386edcc78f0b7d01f1cd6b2bcf2d9f05a6d34b7add17e9418329072d184c7840aed0f50eb1
diff --git a/app-emacs/mailcrypt/files/50mailcrypt-gentoo.el b/app-emacs/mailcrypt/files/50mailcrypt-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/mailcrypt/files/50mailcrypt-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/mailcrypt/mailcrypt-3.5.9.ebuild b/app-emacs/mailcrypt/mailcrypt-3.5.9.ebuild
new file mode 100644
index 000000000000..ee1ecbc9e39e
--- /dev/null
+++ b/app-emacs/mailcrypt/mailcrypt-3.5.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp autotools
+
+DESCRIPTION="Provides a simple interface to public key cryptography with OpenPGP"
+HOMEPAGE="http://mailcrypt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mailcrypt/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+RESTRICT="test"
+
+RDEPEND="app-crypt/gnupg"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ eautoreconf
+}
+
+src_configure() {
+ export EMACS=/usr/bin/emacs
+ econf
+}
+
+src_install() {
+ emake \
+ lispdir="${D}${SITELISP}/${PN}" \
+ infodir="${D}/usr/share/info" \
+ install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc ANNOUNCE ChangeLog* INSTALL LCD-entry NEWS ONEWS README*
+
+ DOC_CONTENTS="See the INSTALL file in /usr/share/doc/${PF} for how
+ to customize mailcrypt."
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/mailcrypt/metadata.xml b/app-emacs/mailcrypt/metadata.xml
new file mode 100644
index 000000000000..e6681b04f09a
--- /dev/null
+++ b/app-emacs/mailcrypt/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">mailcrypt</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/markdown-mode-2.1 b/app-emacs/markdown-mode-2.1
deleted file mode 100644
index b40ebbbc9b10..000000000000
--- a/app-emacs/markdown-mode-2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Major mode for editing Markdown-formatted text files
-EAPI=5
-HOMEPAGE=https://jblevins.org/projects/markdown-mode/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=|| ( dev-python/markdown2 dev-python/markdown ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/markdown-mode-2.1.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=2c412ebe9b12f0451a09838d2db1488f
diff --git a/app-emacs/markdown-mode-2.3 b/app-emacs/markdown-mode-2.3
deleted file mode 100644
index 4a235cdc0fda..000000000000
--- a/app-emacs/markdown-mode-2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Major mode for editing Markdown-formatted text files
-EAPI=5
-HOMEPAGE=https://jblevins.org/projects/markdown-mode/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=|| ( dev-python/markdown2 dev-python/markdown ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://stable.melpa.org/packages/markdown-mode-2.3.el
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=96d0d55530ff13324b9c7f17e18a4047
diff --git a/app-emacs/markdown-mode/Manifest b/app-emacs/markdown-mode/Manifest
new file mode 100644
index 000000000000..f7589f5fae92
--- /dev/null
+++ b/app-emacs/markdown-mode/Manifest
@@ -0,0 +1,7 @@
+AUX 50markdown-mode-gentoo.el 252 BLAKE2B 1b718b5fb40ac043f74647d1bbf344bf07a63e530bd4ab3a52231c148b3bf824815a5e15482481ef4a9a183acc8894b9edcf3726af270dcbcfd9b42d502105b2 SHA512 403f80133fddcd2647d1e0c077628bb984e33b89dd68fdee05f87a13aa6b89e344c76944d3885789789884e7298dc9c1ced716fe721b1b2ed6dcf9bbb0f24f91
+AUX markdown-mode-2.1-text-auto-mode.patch 833 BLAKE2B fb0eade55f75123e1166fdc4b59199daf5fd58771a8aadaf890220d84d844657d9f2b3b87c2f5f1db31dfd45042f404d7b4dd248e4d6ce9fc5937579cc21a126 SHA512 72d1206398d3f72a35c20e14f267bbe1419102f479feff55d80054309ff7e7bce291dc50b6e010a34f435f9fbdfe249261f8ab073c986994160f91ed5bf8a8ee
+DIST markdown-mode-2.1.el.xz 50484 BLAKE2B 12ae664f0680a420727148c2ed78275ab7dcdc8ae742a0152f82dc25150cea9bd5d880b9244351792354ac1d64789267163512e55c2b83f64855bbc0ab0ac33e SHA512 3f0d68b03408281e49c9dbf4d26b8c1f766aa675efea6789b13722c7b1d831af35d3ea30ac071be00242279bca31d04fe92a28b901698fe2072d4504d9901253
+DIST markdown-mode-2.3.el 387130 BLAKE2B acb583126a6f952835537f9e386df5f9a8fda5e49a14520e153c0cc99fc58cca596607b282f9f7070b001fe8165d50adb9abb81de1b03ae102cf2061de587810 SHA512 0820c5ae585e0f5ee8fef9eca40f2de2ad632a2559ea7f447cd19ded592de38bf2f3df8491796c15eb06723fe2af904335535af145356c7a7f9f855612263aaf
+EBUILD markdown-mode-2.1.ebuild 656 BLAKE2B b9f8506be2cf90606894ac35871114b1da8b4efd9d21a187f6812d33a0f7a6161440d6781a30cdfba8b15c8d3532296c2276f702c82b342f0c2a348fe2b76647 SHA512 5da9fda79af6213b5afa30ac58dfc0664f438ac027b840d0481a5637e5b72750b461e57f8f3ecddbe68391f279b1745982b6981003238090a8422c3a088e88ae
+EBUILD markdown-mode-2.3.ebuild 544 BLAKE2B 71db933d1f2befe6058416fa91aa09135df4e1e24f195a5ef717717aecb078a91fa12c977dde87585435f9e8f36b73fb989d3c4b1da20a21963214ed6f277583 SHA512 a74d3433cbf3cee27233b2f9d55e0d238c667840f3feafe2e2a2fa1a0ac7e7521e710ed12acd12e9a5ff05cb113fee2d3c682967b380bc1a8d31288a89591914
+MISC metadata.xml 357 BLAKE2B e316ea7b6be23cb10196d2ce47b4eb745e69fb92ceabceac4e3f33d295ff5dbd0b9db66f316895849ee54b53880b41d5708e6233f48bfc8f073128c543f6c427 SHA512 0bb062f8a6e739e53898467f8314b799b1997a9161c71cd39287da713e18f748080674ec34d56ca3e478dafbcb8462962d5c8949fb1e8bbc3cf866a2b95301ea
diff --git a/app-emacs/markdown-mode/files/50markdown-mode-gentoo.el b/app-emacs/markdown-mode/files/50markdown-mode-gentoo.el
new file mode 100644
index 000000000000..fb4a5cba03e8
--- /dev/null
+++ b/app-emacs/markdown-mode/files/50markdown-mode-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'markdown-mode "markdown-mode"
+ "Major mode for editing Markdown files" t)
+(add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
+(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
diff --git a/app-emacs/markdown-mode/files/markdown-mode-2.1-text-auto-mode.patch b/app-emacs/markdown-mode/files/markdown-mode-2.1-text-auto-mode.patch
new file mode 100644
index 000000000000..91449c6daa54
--- /dev/null
+++ b/app-emacs/markdown-mode/files/markdown-mode-2.1-text-auto-mode.patch
@@ -0,0 +1,23 @@
+From a70e74e0eedb436c4126ac69b0beaa4ab848b78e Mon Sep 17 00:00:00 2001
+From: Steve Purcell <steve@sanityinc.com>
+Date: Mon, 14 Mar 2016 09:18:16 +1300
+Subject: Remove autoload for .text
+
+While .md and .markdown are clearly markdown files, the handling of .text is not a choice that markdown-mode should be making on the user's behalf without any opportunity to prevent it.
+
+diff --git a/markdown-mode.el b/markdown-mode.el
+index b7a32cc..978e040 100644
+--- a/markdown-mode.el
++++ b/markdown-mode.el
+@@ -6634,8 +6634,6 @@ BEG and END are the limits of scanned region."
+ ;;;###autoload
+ (add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
+ ;;;###autoload
+-(add-to-list 'auto-mode-alist '("\\.text\\'" . markdown-mode))
+-;;;###autoload
+ (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
+
+
+--
+cgit v0.10.2
+
diff --git a/app-emacs/markdown-mode/markdown-mode-2.1.ebuild b/app-emacs/markdown-mode/markdown-mode-2.1.ebuild
new file mode 100644
index 000000000000..571a3cbe3b7c
--- /dev/null
+++ b/app-emacs/markdown-mode/markdown-mode-2.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Major mode for editing Markdown-formatted text files"
+HOMEPAGE="https://jblevins.org/projects/markdown-mode/"
+# Cannot use this url because its hash differ about every five minutes
+# SRC_URI="http://jblevins.org/git/${PN}.git/snapshot/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="|| ( dev-python/markdown2 dev-python/markdown )"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_PATCHES="${P}-text-auto-mode.patch"
diff --git a/app-emacs/markdown-mode/markdown-mode-2.3.ebuild b/app-emacs/markdown-mode/markdown-mode-2.3.ebuild
new file mode 100644
index 000000000000..1a8f2d0437c3
--- /dev/null
+++ b/app-emacs/markdown-mode/markdown-mode-2.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Major mode for editing Markdown-formatted text files"
+HOMEPAGE="https://jblevins.org/projects/markdown-mode/"
+SRC_URI="https://stable.melpa.org/packages/${P}.el"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="|| ( dev-python/markdown2 dev-python/markdown )"
+
+S="${WORKDIR}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+ cp "${DISTDIR}"/${P}.el ${PN}.el || die
+}
diff --git a/app-emacs/markdown-mode/metadata.xml b/app-emacs/markdown-mode/metadata.xml
new file mode 100644
index 000000000000..40217af13785
--- /dev/null
+++ b/app-emacs/markdown-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>naota@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/matlab-3.3.2_pre20130829 b/app-emacs/matlab-3.3.2_pre20130829
deleted file mode 100644
index b723418a1d5d..000000000000
--- a/app-emacs/matlab-3.3.2_pre20130829
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Major modes for MATLAB .m and .tlc files
-EAPI=5
-HOMEPAGE=http://matlab-emacs.sourceforge.net/
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/matlab-3.3.2_pre20130829.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=990e213706cfb26162892e73264b024c
diff --git a/app-emacs/matlab/Manifest b/app-emacs/matlab/Manifest
new file mode 100644
index 000000000000..aa078a440e92
--- /dev/null
+++ b/app-emacs/matlab/Manifest
@@ -0,0 +1,4 @@
+AUX 50matlab-gentoo.el 61 BLAKE2B a826b081eb0aff32febe07f31946cc427ece09616a982f9442465c1608816adb4e2dc565220e0a3e90dce8deacdd8443323dfcecaa4bb4b0a773ee2e254c0c4d SHA512 673f71817e587dd3c33073829a946b2ebcd90ef0444eb40d514cd4513f5942f7bd8e4f03eeededb171f6d53cff3fc818e8ddfccefdaee6c80f035b0bcf0254eb
+DIST matlab-3.3.2_pre20130829.tar.xz 92784 BLAKE2B 327c1a5126cd3f686b053f404122975578edb92bef53e6c6fadd6ff27873646ab2e15ed5dc3aa34604c052675b9e0f47b82c4c89a72e1de017544a45e826e935 SHA512 b549314f71dd876453c395268a0ec1fca8d68ba8ae074ef45d0fb430afbbd6a45bc30a45bdd64be83dd44a0114d7f4ec8ca2f9acb250337fbdc407691d0a2c00
+EBUILD matlab-3.3.2_pre20130829.ebuild 473 BLAKE2B ab46d4cd9e60ecad9850aad877914c29d517e04b4a69fd354ab0ccab4e69fd5712743ecffa4906e585bf5d8aa743b2f4a76db8e0507da949150209ccff7dca4d SHA512 6e5f15ad7e081ad1c2b3b921954b854a4339a3257cbeda4a440066a0533389b656aa485dbcb123e31502aeeca49ed1e2ed6b1f7a8a3970ac757071fa330a5b27
+MISC metadata.xml 362 BLAKE2B 9f602fd377b19317a6d92083b224f007d5a2f997bbb17396cbd84e742e7cc6b9b0da1a28f7123984594d226f0978dabbe26ae6e0adad50630b90461315e9910d SHA512 bc473891af67b75c5ccd5943193e40bbfcee6d0aa21ab0a2a5f64d8a6833f3a6542e45282deffeb46a496d16d6f6e7ae21c353cb884904f682559b50233f259e
diff --git a/app-emacs/matlab/files/50matlab-gentoo.el b/app-emacs/matlab/files/50matlab-gentoo.el
new file mode 100644
index 000000000000..f15e838a2985
--- /dev/null
+++ b/app-emacs/matlab/files/50matlab-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'matlab-load)
diff --git a/app-emacs/matlab/matlab-3.3.2_pre20130829.ebuild b/app-emacs/matlab/matlab-3.3.2_pre20130829.ebuild
new file mode 100644
index 000000000000..b0363bf6bfcf
--- /dev/null
+++ b/app-emacs/matlab/matlab-3.3.2_pre20130829.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Major modes for MATLAB .m and .tlc files"
+HOMEPAGE="http://matlab-emacs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+S="${WORKDIR}/matlab-emacs"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README INSTALL ChangeLog*"
diff --git a/app-emacs/matlab/metadata.xml b/app-emacs/matlab/metadata.xml
new file mode 100644
index 000000000000..e923cd5c8d95
--- /dev/null
+++ b/app-emacs/matlab/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">matlab-emacs</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/mediawiki-2.2.4.1 b/app-emacs/mediawiki-2.2.4.1
deleted file mode 100644
index 6bcfe6548142..000000000000
--- a/app-emacs/mediawiki-2.2.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=MediaWiki client for Emacs
-EAPI=5
-HOMEPAGE=https://launchpad.net/mediawiki-el
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mediawiki-2.2.4.1.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=0a9d1448f80a21e985009120da25b65c
diff --git a/app-emacs/mediawiki/Manifest b/app-emacs/mediawiki/Manifest
new file mode 100644
index 000000000000..edaa24b1e5d3
--- /dev/null
+++ b/app-emacs/mediawiki/Manifest
@@ -0,0 +1,4 @@
+AUX 50mediawiki-gentoo.el 395 BLAKE2B be76f989906bd8c6eae72257ebddeeaf1dc9eb6ae45488e7afcaa73a1a173800a83510bbd683a172afd2597b7173f8e4ceb7cfab910c0ece77c76833bd85a055 SHA512 579680b31ffb86b68e1ccc8c7f4969860437a34bd2cc308cb9400ea861d313c2b2d538412eadbdff9d56ddfdab8f7312dc8cb97137a6c8c2707ebce4437c7b79
+DIST mediawiki-2.2.4.1.el.xz 19108 BLAKE2B e8603a622c80943153f96f6f9997053fd0913ef23e0a672576726fbac3d2a5de850afbcdb3748a05769b9c880bc641aa8aa5e48bf6dca800b1fbadd6c8b8a2ce SHA512 4526c04c560679196900310c90d6321ab10a447ff4f904b0bc40bfc56296c3a773cc8fe7d4001cdfc108e9e11ce3ca4dd6677e51b220eb3b453a1b975118f52c
+EBUILD mediawiki-2.2.4.1.ebuild 357 BLAKE2B 5bbf3c1758797c4258d1eb842a9a37e4b3c9444db03de4f0c3476d9928de28b221716ad21564b775aba21a735488616e059a45c6a6639374fd1e550308f4a834 SHA512 726db4d0cad4bd04b56028bd37dc3ce5db8ffe89048292aa81691ea89cd8d24b4a4e4baf997f25489e490a902b7a2b66a1abbcfba47127f89886eee569da02c0
+MISC metadata.xml 360 BLAKE2B a8bea1d7a9c2b71040527e427b6924d7df89d8e68a5d11cd6cfb63b545355049ea059d5245d0289d3a90ce096cf8908bba0d854e04e7adf4d13deb6fbbcc85e1 SHA512 3e148d922f9e2828274c0f721663520a5526dbf36e5f3e61b3423a833c3bd5cdbb9d4b0410a35fe8d8c3427d9a0c1af2f3f4a304e5504b1a6ce411735b08413a
diff --git a/app-emacs/mediawiki/files/50mediawiki-gentoo.el b/app-emacs/mediawiki/files/50mediawiki-gentoo.el
new file mode 100644
index 000000000000..25acf753f365
--- /dev/null
+++ b/app-emacs/mediawiki/files/50mediawiki-gentoo.el
@@ -0,0 +1,10 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'mediawiki-open "mediawiki"
+ "Open a wiki page specified by NAME from the mediawiki engine" t)
+(autoload 'mediawiki-site "mediawiki"
+ "Set up mediawiki.el for a site." t)
+(eval-after-load "mediawiki"
+ '(add-to-list 'mediawiki-site-alist
+ '("Gentoo" "http://wiki.gentoo.org/" "" "" "Main Page")
+ nil
+ (lambda (a b) (equal (car a) (car b)))))
diff --git a/app-emacs/mediawiki/mediawiki-2.2.4.1.ebuild b/app-emacs/mediawiki/mediawiki-2.2.4.1.ebuild
new file mode 100644
index 000000000000..f68cd85b1dc0
--- /dev/null
+++ b/app-emacs/mediawiki/mediawiki-2.2.4.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="MediaWiki client for Emacs"
+HOMEPAGE="https://launchpad.net/mediawiki-el"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/mediawiki/metadata.xml b/app-emacs/mediawiki/metadata.xml
new file mode 100644
index 000000000000..ea38af629394
--- /dev/null
+++ b/app-emacs/mediawiki/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="launchpad">mediawiki-el</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/metadata.xml b/app-emacs/metadata.xml
new file mode 100644
index 000000000000..f19199dfdedd
--- /dev/null
+++ b/app-emacs/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The app-emacs category contains extension packages for the Emacs text
+ editor.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie app-emacs enthlt Pakete fr den Texteditor Emacs.
+ </longdescription>
+ <longdescription lang="es">
+ La categora app-emacs contiene paquetes de extensin para el editor
+ de texto Emacs.
+ </longdescription>
+ <longdescription lang="ja">
+ app-emacsEmacs
+
+ </longdescription>
+ <longdescription lang="nl">
+ De app-emacs categorie bevat extensies voor Emacs.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhm app-emacs cha cc gi m rng cho trnh son
+ tho vn bn Emacs.
+ </longdescription>
+ <longdescription lang="it">
+ La categoria app-emacs contiene pacchetti di estensioni per l'editor di testo Emacs.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria app-emacs contm pacotes de extenso para o editor de
+ texto Emacs.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria app-emacs zawiera pakiety zwizane z edytorem tekstu Emacs.
+ </longdescription>
+</catmetadata>
diff --git a/app-emacs/mew-6.5 b/app-emacs/mew-6.5
deleted file mode 100644
index aa16c47ef321..000000000000
--- a/app-emacs/mew-6.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-libs/zlib >=virtual/emacs-23
-DESCRIPTION=Great MIME mail reader for Emacs/XEmacs
-EAPI=4
-HOMEPAGE=http://www.mew.org/
-IUSE=ssl l10n_ja
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD
-RDEPEND=sys-libs/zlib ssl? ( net-misc/stunnel ) >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.mew.org/Release/mew-6.5.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=725eefd02e6e75a1c7e7a57aff4df574
diff --git a/app-emacs/mew-6.6 b/app-emacs/mew-6.6
deleted file mode 100644
index 422a6eaf8e7e..000000000000
--- a/app-emacs/mew-6.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-libs/zlib >=virtual/emacs-23
-DESCRIPTION=Great MIME mail reader for Emacs/XEmacs
-EAPI=5
-HOMEPAGE=http://www.mew.org/
-IUSE=ssl l10n_ja
-KEYWORDS=amd64 ppc x86
-LICENSE=BSD
-RDEPEND=sys-libs/zlib ssl? ( net-misc/stunnel ) >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.mew.org/Release/mew-6.6.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e8efc070b8386571104b0b33e90d9973
diff --git a/app-emacs/mew/Manifest b/app-emacs/mew/Manifest
new file mode 100644
index 000000000000..94a5bf645c3a
--- /dev/null
+++ b/app-emacs/mew/Manifest
@@ -0,0 +1,6 @@
+AUX 50mew-gentoo.el 195 BLAKE2B cca28ee1ad51b86b1fea56490f93365aead98f123df2f778a1f2ef2207745c551a5ac9eb10386208a8ffafbd5f3498a9ef27aa5eb0bb5d4ffcc6e4bd3c854ca6 SHA512 2bd1f98dbedcbd4529f63bad9ac6093e4e783afb95270f672b30e9a50f8d0f3fbc7527ae975d35b9650ac6fa8b3ea32352985e8757adb5d9f064449623459eeb
+DIST mew-6.5.tar.gz 1026322 BLAKE2B 16fa19eb19ce4b49ea1b33db13c46a8b6c79cdc602e6bc295d1ab3310db772dc2a73c6c218ce6358baba943e6572a803103e8bc56d3eaeb67dd29666e482f3f5 SHA512 481c55915e57889e7b8c6d27c3d21802b624a886eb8f6541c2997db4d5328e16c3b5a8c9a9ce09637b1779b8c52af86a8662ee30dfbab0a411a586d4679ac69e
+DIST mew-6.6.tar.gz 989941 BLAKE2B 7ec4e502865e13108cc51dc74ffa246dd1084ae369979c05b9c1fc326c01f716766b7aa445ac489fe7c34cbc610e130738fa7578ab338d496970f6e59847c295 SHA512 55a91faaba09a28dfe7da33d34a8c3638540db71a3572ce01646976fbdd0ac3e327475ccc2908876ee6f516c6ee60082a27413b210c4591ef12cc4f878a07472
+EBUILD mew-6.5.ebuild 978 BLAKE2B 9bc36170e0da4cbe8391be66fc0b6e5247bb98b43e9f40c1c5f306fa37283c996de02af4544c9a8fbb3230ad322168824943b8970d1774a714f32fc39e8bbb20 SHA512 66aed50ab39771fca6272f6faf87acfb83a39f51d777f1935b619148d590c40ceb1748a94bf577c5a8137d06887d8204e2294b1c3179d1791b20e2092e4c8fab
+EBUILD mew-6.6.ebuild 983 BLAKE2B c0a7b1a2442cc25d8e23f26cd50de0eedad8fb879c5582cc2cc1ff68e74d8c4dd28817f86afaef2f67066f7e391ee5974a193d925bc7a0d14cfa6cddee5a6b67 SHA512 3b92dd4956bb82d8d59451b010b1e28b6e9c27e965c2a8ecdff5d9eedd77a215cc1c5d08159cb808bf14c1ba8c8d8b84a903c942256226d34066dee9e5c11073
+MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/mew/files/50mew-gentoo.el b/app-emacs/mew/files/50mew-gentoo.el
new file mode 100644
index 000000000000..1f36f8e08d93
--- /dev/null
+++ b/app-emacs/mew/files/50mew-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'mew "mew" nil t)
+(autoload 'mew-send "mew" nil t)
+
+(setq mew-icon-directory "@SITEETC@")
+(setq mew-pop-port "pop-3")
+(setq mew-imap-port "imap2")
diff --git a/app-emacs/mew/metadata.xml b/app-emacs/mew/metadata.xml
new file mode 100644
index 000000000000..c438baf3b326
--- /dev/null
+++ b/app-emacs/mew/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 type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-emacs/mew/mew-6.5.ebuild b/app-emacs/mew/mew-6.5.ebuild
new file mode 100644
index 000000000000..40d3f282f443
--- /dev/null
+++ b/app-emacs/mew/mew-6.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Great MIME mail reader for Emacs/XEmacs"
+HOMEPAGE="http://www.mew.org/"
+SRC_URI="http://www.mew.org/Release/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="ssl l10n_ja"
+RESTRICT="test"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}
+ ssl? ( net-misc/stunnel )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+ econf \
+ --with-elispdir="${SITELISP}/${PN}" \
+ --with-etcdir="${SITEETC}/${PN}"
+}
+
+src_compile() {
+ emake
+ use l10n_ja && emake jinfo
+ rm -f info/*~ # remove spurious backup files
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ use l10n_ja && emake DESTDIR="${D}" install-jinfo
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ dodoc 00api 00changes* 00diff 00readme dot.*
+}
+
+pkg_postinst() {
+ elisp-site-regen
+ elog "Please refer to /usr/share/doc/${PF} for sample configuration files."
+}
diff --git a/app-emacs/mew/mew-6.6.ebuild b/app-emacs/mew/mew-6.6.ebuild
new file mode 100644
index 000000000000..fc5d683d3253
--- /dev/null
+++ b/app-emacs/mew/mew-6.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+DESCRIPTION="Great MIME mail reader for Emacs/XEmacs"
+HOMEPAGE="http://www.mew.org/"
+SRC_URI="http://www.mew.org/Release/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="ssl l10n_ja"
+RESTRICT="test"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}
+ ssl? ( net-misc/stunnel )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+ econf \
+ --with-elispdir="${SITELISP}/${PN}" \
+ --with-etcdir="${SITEETC}/${PN}"
+}
+
+src_compile() {
+ emake
+ use l10n_ja && emake jinfo
+ rm -f info/*~ # remove spurious backup files
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ use l10n_ja && emake DESTDIR="${D}" install-jinfo
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc 00api 00changes* 00diff 00readme dot.*
+
+ DOC_CONTENTS="Please refer to /usr/share/doc/${PF} for sample
+ configuration files."
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/mic-paren-3.11 b/app-emacs/mic-paren-3.11
deleted file mode 100644
index 4138604dc99b..000000000000
--- a/app-emacs/mic-paren-3.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Advanced highlighting of matching parentheses
-EAPI=5
-HOMEPAGE=http://www.gnuvola.org/software/j/mic-paren/ https://www.emacswiki.org/emacs/MicParen
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/mic-paren-3.11.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=6502c441b1513c0ce29e69f2fa12da11
diff --git a/app-emacs/mic-paren/Manifest b/app-emacs/mic-paren/Manifest
new file mode 100644
index 000000000000..462fa62dbb5f
--- /dev/null
+++ b/app-emacs/mic-paren/Manifest
@@ -0,0 +1,4 @@
+AUX 50mic-paren-gentoo.el 518 BLAKE2B 8d51d848689e272dabdb882851e4920dab94a17e9dc9096aaf9a7dcc25035966a9b1886d2ddd8d3b3dd5a734fed3615d4d7b5a59620a46924470c732ecd32ae4 SHA512 a49520fe38aa5ad7e7d479bcdeb8391bc0aa982c59769dc264daae700ece7fa1fbc02ce574fde2f2c3e170467d7633965c4e36f4fe995c8b112a6ebef690ab07
+DIST mic-paren-3.11.el.xz 13992 BLAKE2B 05b99123f32248eb20611c1889e26af34c42f7f3a37753eda59bfb0e499befd698644b283cbd491925e7a766293e0fe2172dc1da9a36eb94be94e17a6b9cd46d SHA512 ac896c425330935c0d6ae86eb65232c8fb6c463f6cf259c4bfd79023c3e25243d6b998e9f0ea5393ef1491ab0bf1d6fe5dd33278fec93ec3231603bb6e910b77
+EBUILD mic-paren-3.11.ebuild 474 BLAKE2B 226ea32c19504b7542f51d9d537c12a795325f0eb5b38d0b192ec276484db3fd21a7c59dfa7ab99f6a18d2d37e16251e3a02e3cfb622d7d103f8f39e5d602fb7 SHA512 fc5c3a036da3fef773fbb12b59e104fd9253e14f344d3387b4cec9ffb651c9da000a3129dff7f24e2a7c81712ad800618fd1819dc179ac3129c733b5986f9486
+MISC metadata.xml 693 BLAKE2B 57246079b1564ecef68572b0c44866e74cb1c78f75f2528dcb8d5098f5af978807672fb5070195667d6894577d94e89b2ba789334ac51cf085c784b53438bb4c SHA512 819def7503979fe283cde6f69b3e1cb807eb005a793640cbab7ecc6913b6c0107e0efcc3fd7cd5be6319ec0200fe358eb95ea89f914304e0b7fe043d7696c5e3
diff --git a/app-emacs/mic-paren/files/50mic-paren-gentoo.el b/app-emacs/mic-paren/files/50mic-paren-gentoo.el
new file mode 100644
index 000000000000..f94136de0545
--- /dev/null
+++ b/app-emacs/mic-paren/files/50mic-paren-gentoo.el
@@ -0,0 +1,10 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'paren-activate "mic-paren"
+ "Activates mic-paren parenthesis highlighting." t)
+(autoload 'paren-deactivate "mic-paren"
+ "Deactivates mic-paren parenthesis highlighting" t)
+(autoload 'paren-toggle-matching-paired-delimiter "mic-paren" nil t)
+(autoload 'paren-toggle-matching-quoted-paren "mic-paren" nil t)
+(autoload 'paren-toggle-open-paren-context "mic-paren" nil t)
+(autoload 'paren-forward-sexp "mic-paren" nil t)
+(autoload 'paren-backward-sexp "mic-paren" nil t)
diff --git a/app-emacs/mic-paren/metadata.xml b/app-emacs/mic-paren/metadata.xml
new file mode 100644
index 000000000000..9d44bd6def4b
--- /dev/null
+++ b/app-emacs/mic-paren/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ Load this file, activate it and Emacs will display highlighting on whatever
+ parenthesis (and paired delimiter if you like this) matches the one before
+ or after point. This is an extension to the paren.el file distributed with
+ Emacs. The default behaviour is similar to paren.el but more sophisticated.
+ Normally you can try all default settings to enjoy mic-paren.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/mic-paren/mic-paren-3.11.ebuild b/app-emacs/mic-paren/mic-paren-3.11.ebuild
new file mode 100644
index 000000000000..e876870415ef
--- /dev/null
+++ b/app-emacs/mic-paren/mic-paren-3.11.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Advanced highlighting of matching parentheses"
+HOMEPAGE="http://www.gnuvola.org/software/j/mic-paren/
+ https://www.emacswiki.org/emacs/MicParen"
+# taken from http://www.gnuvola.org/software/j/mic-paren/mic-paren.el
+SRC_URI="mirror://gentoo/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/mldonkey-0.0.4b-r1 b/app-emacs/mldonkey-0.0.4b-r1
deleted file mode 100644
index ebdddd621a5b..000000000000
--- a/app-emacs/mldonkey-0.0.4b-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Emacs Lisp interface to the MLDonkey core
-EAPI=4
-HOMEPAGE=https://www.emacswiki.org/emacs/MlDonkey http://web.archive.org/web/20070107165326/www.physik.fu-berlin.de/~dhansen/mldonkey/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/mldonkey-el-0.0.4b.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=5e49c2278d2327f7559448aa9f713b2b
diff --git a/app-emacs/mldonkey/Manifest b/app-emacs/mldonkey/Manifest
new file mode 100644
index 000000000000..04b76c7dfb10
--- /dev/null
+++ b/app-emacs/mldonkey/Manifest
@@ -0,0 +1,6 @@
+AUX 50mldonkey-gentoo.el 604 BLAKE2B 52632176ed6adc1cb0c871bfc94b2c01d5ec26b1950a220981f955e015156581feb932cc73888eb2920b93bdeacf2340b560f6fcce12cdf5f16eeaee4a093c9f SHA512 d89caa4fecb8d16df7595f770ad479adae0e094b36c04a6a6291abff0052d49d14afc835e38466f156a95579889c2f127fbafa1818bc14d4915851f9b4a9a2af
+AUX mldonkey-0.0.4b-emacs-26.patch 387 BLAKE2B aa881c515f8c1d5125af2bd237e94ba20649087c95153f8ce92323dd977d7878475c8709057a3725ed78cbf3d777fb7b5ae00c6a911da75869232ae228edffc4 SHA512 f00edaf33d8d182e7c7e432cfcf4f0ac9b6a8f6f68d44266e9dbed53657c00bc5db5b1f6c5e190988c217711de5dcfdaef091de2581425be7bce2a44b8a0c9d6
+AUX mldonkey-0.0.4b-vd.patch 3511 BLAKE2B 00e05b1d18183fd8be439e7987b9dabdfb0c3e419b5497842c7598e534ae3e867943244a17991ce573dc0b3d86ab2844bba7cc09738d0ead137199a2bdfeb3fc SHA512 18ae6a4925b54b5d40ad9342fa65596df47e48a7223ca1a89c8622ab324f805d55c9bfaeea71c8465fd276997a34d979ff16532b8d8d86c4748fedf9ed02381b
+DIST mldonkey-el-0.0.4b.tar.gz 17442 BLAKE2B d9057a00c3b3532162564f59afb838a41b83b17adeb569d86c13cef8a6338083f12d078a19d0568936d9116e0c9adf0b53db3933116dc46925ac095c1a529d89 SHA512 3c6a16292968e0f40d319614bfd2a53c9612ec4121c5720f51498d8983f6b944c38fc1d664f1c7ebe1d68653ba62d828fa00092b1a1d278547c225b33f4e740b
+EBUILD mldonkey-0.0.4b-r1.ebuild 926 BLAKE2B 442018577f992d42349d97f58dffeb5749229011602e6117ef3001a211b076409705e9c503bf2cf485eda552e90110f41cf3a472673e20adb31e52b20fdb99e9 SHA512 9a85aadc2beeeceebc925cb14683331528d728758873d73aa04e180af93e4f469a0a74b55c230af13411d6e1a816e3effaac65e37e46b2487731f176cdebee83
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/mldonkey/files/50mldonkey-gentoo.el b/app-emacs/mldonkey/files/50mldonkey-gentoo.el
new file mode 100644
index 000000000000..c3bb77b43aaa
--- /dev/null
+++ b/app-emacs/mldonkey/files/50mldonkey-gentoo.el
@@ -0,0 +1,18 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'mldonkey "mldonkey" "Run the MlDonkey interface." t)
+
+(setq mldonkey-vd-filename-filters
+ '(mldonkey-vd-filename-remove-p20
+ mldonkey-vd-filename-remove-trailing-ws))
+
+(setq mldonkey-vd-sort-functions
+ '((not mldonkey-vd-sort-dl-state)
+ (not mldonkey-vd-sort-dl-percent)))
+
+(setq mldonkey-vd-sort-fin-functions
+ '(mldonkey-vd-sort-dl-number))
+
+(add-hook 'mldonkey-pause-hook 'mldonkey-vd)
+(add-hook 'mldonkey-resume-hook 'mldonkey-vd)
+(add-hook 'mldonkey-commit-hook 'mldonkey-vd)
+(add-hook 'mldonkey-recover-temp-hook 'mldonkey-vd)
diff --git a/app-emacs/mldonkey/files/mldonkey-0.0.4b-emacs-26.patch b/app-emacs/mldonkey/files/mldonkey-0.0.4b-emacs-26.patch
new file mode 100644
index 000000000000..0548fd96c97f
--- /dev/null
+++ b/app-emacs/mldonkey/files/mldonkey-0.0.4b-emacs-26.patch
@@ -0,0 +1,14 @@
+Fix byte compilation with Emacs 26.
+https://bugs.gentoo.org/647638
+
+--- mldonkey-el-0.0.4b-orig/mldonkey-vd.el
++++ mldonkey-el-0.0.4b/mldonkey-vd.el
+@@ -801,7 +801,7 @@
+ (insert "\n")))
+
+
+-(defun mldonkey-vd-insert (&optional ignore-1 &optional ignore-2)
++(defun mldonkey-vd-insert (&optional ignore-1 ignore-2)
+
+ "Insert the table with the downloads in the MlDonkey buffer."
+
diff --git a/app-emacs/mldonkey/files/mldonkey-0.0.4b-vd.patch b/app-emacs/mldonkey/files/mldonkey-0.0.4b-vd.patch
new file mode 100644
index 000000000000..a763643f78b2
--- /dev/null
+++ b/app-emacs/mldonkey/files/mldonkey-0.0.4b-vd.patch
@@ -0,0 +1,121 @@
+Patch by Peter Salvi <vukung@yahoo.com> to conform to MLDonkey 2.9.2,
+taken from http://www.emacswiki.org/cgi-bin/wiki/download/mldonkey-vd.patch.gz
+and ported to mldonkey-0.0.4b
+
+--- mldonkey-el-0.0.4b-orig/mldonkey-vd.el 2005-01-15 20:54:53.000000000 +0100
++++ mldonkey-el-0.0.4b/mldonkey-vd.el 2008-01-03 10:53:18.000000000 +0100
+@@ -107,6 +107,26 @@
+ :group 'mldonkey
+ :type 'boolean)
+
++(defcustom mldonkey-show-release-status nil
++ "Show the release status of a download."
++ :group 'mldonkey
++ :type 'boolean)
++
++(defcustom mldonkey-show-comments nil
++ "Show the number of comments in a download."
++ :group 'mldonkey
++ :type 'boolean)
++
++(defcustom mldonkey-show-user nil
++ "Show the user of a download."
++ :group 'mldonkey
++ :type 'boolean)
++
++(defcustom mldonkey-show-group nil
++ "Show the group of a download."
++ :group 'mldonkey
++ :type 'boolean)
++
+ (defcustom mldonkey-show-filename t
+ "Show the filename of a download."
+ :group 'mldonkey
+@@ -275,6 +295,14 @@
+ ;; FIXME: does a network may contain spaces?
+ "\\[\\(.*?\\)[ \t]*\\([0-9]+\\)\\]" ; network and number
+ "[ \t]+"
++ "\\(R\\|\\-\\)" ; release status
++ "[ \t]+"
++ "\\([0-9]+\\)" ; comments
++ "[ \t]+"
++ "\\([^ \t]+\\)" ; user
++ "[ \t]+"
++ "\\([^ \t]+\\)" ; group
++ "[ \t]+"
+ "\\([^\n]+\\)" ; filename
+ "[ \t]+"
+ "\\([0-9\\.]+\\)" ; percent
+@@ -283,10 +311,9 @@
+ "[ \t]+"
+ "\\([0-9\\.]+\\(?:gb\\|mb\\|kb\\|b\\)\\)" ; size
+ "[ \t]+"
+- ;; "\\([0-9\\.]+\\(?:gb\\|mb\\|kb\\|b\\|[ \t]*chunks\\)\\)" ; left
+- "\\([0-9]+%\\)" ; avail
++ "\\([0-9:\\-]+\\)" ; last seen
+ "[ \t]+"
+- "\\([0-9]+\\):\\([0-9\\-]+\\)" ; age and last seen
++ "\\([0-9:\\-]+\\)" ; age
+ "[ \t]+"
+ "\\([0-9]+\\)/\\([0-9]+\\)" ; active sources and total sources
+ "[ \t]+"
+@@ -454,7 +481,7 @@
+ (setq mldonkey-vd-num-downloading (1+ mldonkey-vd-num-downloading))
+ (add-to-list
+ 'mldonkey-vd-downloading-list
+- (vconcat (mapcar 'mldonkey-vd-get-match (number-sequence 1 13))))))
++ (vconcat (mapcar 'mldonkey-vd-get-match (number-sequence 1 16))))))
+
+
+ (defun mldonkey-vd-get-finished ()
+@@ -523,13 +550,16 @@
+
+ (vector "net "
+ "# "
++ "rel "
++ "com "
++ "user "
++ "gr "
+ "file "
+ "% "
+ "down "
+ "size "
+- "av "
+- "a "
+ "l "
++ "a "
+ "as "
+ "ts "
+ "kb/s "
+@@ -553,8 +583,11 @@
+
+ (vector 'right
+ 'right
+- 'left
++ 'right
+ 'right
++ 'left
++ 'left
++ 'left
+ 'right
+ 'right
+ 'right
+@@ -584,13 +617,16 @@
+
+ (vector mldonkey-show-network
+ mldonkey-show-number
++ mldonkey-show-release-status
++ mldonkey-show-comments
++ mldonkey-show-user
++ mldonkey-show-group
+ mldonkey-show-filename
+ mldonkey-show-percent
+ mldonkey-show-downloaded
+ mldonkey-show-size
+- mldonkey-show-avail
+- mldonkey-show-days
+ mldonkey-show-last-seen
++ mldonkey-show-days
+ mldonkey-show-active-sources
+ mldonkey-show-total-sources
+ mldonkey-show-rate
diff --git a/app-emacs/mldonkey/metadata.xml b/app-emacs/mldonkey/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/mldonkey/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild b/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
new file mode 100644
index 000000000000..12ed071cfa32
--- /dev/null
+++ b/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+MY_P="${PN}-el-${PV}"
+DESCRIPTION="An Emacs Lisp interface to the MLDonkey core"
+HOMEPAGE="https://www.emacswiki.org/emacs/MlDonkey
+ http://web.archive.org/web/20070107165326/www.physik.fu-berlin.de/~dhansen/mldonkey/"
+SRC_URI="http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+S="${WORKDIR}/${MY_P}"
+ELISP_PATCHES="${P}-vd.patch ${P}-emacs-26.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile ml*.el
+}
+
+pkg_postinst() {
+ elisp-site-regen
+ ewarn
+ ewarn "If your network gets really slow when you use mldonkey,"
+ ewarn "consider reducing the max number of connections. See bug #50510."
+ ewarn
+ elog "Remember to install net-p2p/mldonkey separately if you want to work"
+ elog "with a local instance."
+}
diff --git a/app-emacs/mmm-mode-0.5.4 b/app-emacs/mmm-mode-0.5.4
deleted file mode 100644
index 7731f603e9e8..000000000000
--- a/app-emacs/mmm-mode-0.5.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=Enables the user to edit different parts of a file in different major modes
-EAPI=5
-HOMEPAGE=http://mmm-mode.sourceforge.net/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2+ Texinfo-manual
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/purcell/mmm-mode/archive/0.5.4.tar.gz -> mmm-mode-0.5.4.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=c73a1344ec261dfde8f17b9c4ca4a185
diff --git a/app-emacs/mmm-mode/Manifest b/app-emacs/mmm-mode/Manifest
new file mode 100644
index 000000000000..f0e9ddc65d52
--- /dev/null
+++ b/app-emacs/mmm-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50mmm-mode-gentoo.el 58 BLAKE2B 0114bc73a9125264dd76189479ec708455f88c2d50765154c64f7bd5ad386889b055b280a1dae5fe661962f27caabb06a8b6a0fc709fce83abfe9c21be6fd8da SHA512 4cbf0da7bcadcdb30947fdb789542daef059112c894be4ad418321cf526f7789e86f612c92bc5c11504ae2538f0e73650589663b3f87421543f0047932c6126f
+DIST mmm-mode-0.5.4.tar.gz 174680 BLAKE2B fbe69ffe291d7144ddaa22d161545350893285e2594f9343d6b4e3b6c929a83209c8dbdf5f270b179c98c7fd1ab88d2c5f68066e6aca0ef5e8533335c4c194e9 SHA512 71828769f40ca56d87c581481fc6531466de30155af3f22eb96ee176cd9dae354ed95a6c37d79e47a033bb79c67335e0f50dac2fb57f262bbe0ef43266af2b6e
+EBUILD mmm-mode-0.5.4.ebuild 590 BLAKE2B ad5eb39888db88049f25b124eac984cc989393db979ab9ea2f8623f8743151119ffb7b762c901d8bfba4b0dfe683c0058ffae64c1cb08b603b5b8fc893e50332 SHA512 181a5e26bf067446f5be999f4b42f8c2edbfd249e0cacd31f7586a2b401c27fc392f5c4d06ca4bff95c2594f5e998d9212ca3a44d1ac9e7835ce42eb6706d818
+MISC metadata.xml 414 BLAKE2B f62c75a172d2da325b4f7b0e41e0bc2d7f128e96493b46cd6bc5232915418a506c0d2e2dec88c2b2ac3eace003b4dfdafdeb3da147230c3675a5c3413ee4714f SHA512 ef3005e7c7016dae433d8612bbcf154c928f264ee3203784f2d3756c89c66545cbb3dd29349048b47fb07a1764677068d758d900b4f77fd825c11d5ae82dbd1b
diff --git a/app-emacs/mmm-mode/files/50mmm-mode-gentoo.el b/app-emacs/mmm-mode/files/50mmm-mode-gentoo.el
new file mode 100644
index 000000000000..b7f251ef9c08
--- /dev/null
+++ b/app-emacs/mmm-mode/files/50mmm-mode-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'mmm-auto)
diff --git a/app-emacs/mmm-mode/metadata.xml b/app-emacs/mmm-mode/metadata.xml
new file mode 100644
index 000000000000..9b7ddeeb5744
--- /dev/null
+++ b/app-emacs/mmm-mode/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">mmm-mode</remote-id>
+ <remote-id type="github">purcell/mmm-mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/mmm-mode/mmm-mode-0.5.4.ebuild b/app-emacs/mmm-mode/mmm-mode-0.5.4.ebuild
new file mode 100644
index 000000000000..a1e8968610bb
--- /dev/null
+++ b/app-emacs/mmm-mode/mmm-mode-0.5.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Enables the user to edit different parts of a file in different major modes"
+HOMEPAGE="http://mmm-mode.sourceforge.net/"
+SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="mmm.texinfo"
+DOCS="AUTHORS ChangeLog FAQ NEWS README README.Mason TODO"
diff --git a/app-emacs/moccur-edit-2.16 b/app-emacs/moccur-edit-2.16
deleted file mode 100644
index 91db75439f68..000000000000
--- a/app-emacs/moccur-edit-2.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/color-moccur >=virtual/emacs-23
-DESCRIPTION=An improved interface to color-moccur for editing
-EAPI=5
-HOMEPAGE=http://www.bookshelf.jp/ https://www.emacswiki.org/emacs/SearchBuffers
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=app-emacs/color-moccur >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/moccur-edit-2.16.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=04a639edb97b622a0a18b219bd50febe
diff --git a/app-emacs/moccur-edit/Manifest b/app-emacs/moccur-edit/Manifest
new file mode 100644
index 000000000000..9e2186850073
--- /dev/null
+++ b/app-emacs/moccur-edit/Manifest
@@ -0,0 +1,4 @@
+AUX 60moccur-edit-gentoo.el 97 BLAKE2B e84ce2acdd1a2b4a6551bab2e0059d22591c972825ce4d93e0f8a1c0849ef94c222cae82a183c741ca67fc2c5bebc0a50bc5a561d877ec5e14922b36ebe970a7 SHA512 21f05dfd28e00f0eda98bd2668d9fe4416db39ebc50e5708ba5097fc0ff66358d17342b4b30a50a6effd86097ed79f778ec84b078de2bd106f4e0de26004d801
+DIST moccur-edit-2.16.el.bz2 4325 BLAKE2B a93b09e6a4a844ede92878f70873d56fe7e91142c8702e839b3d44b06f64daf99f73c119453d365586f18c1c69bfe962d5864d79e6c20574f344599204d82825 SHA512 dcb6e2a6336534bf475790c5b80fc86ef8a6ee6d7525a7c45a0050e0f9df3d5d4fdc52151af7ff2ef5c72785affef151c488a12e6b6d723511303bb836d03025
+EBUILD moccur-edit-2.16.ebuild 528 BLAKE2B 2a52b2856e02b85f896c506a36f66eddbb63c97ee0344432dc24539073d56de608da13c566ef138070649da95349cba27c4e97f094a02625020c28ebadb39cbc SHA512 094e826c4f1d499ebb7dfb04224195af586106f6c536fdd2e70ca38f397a9db3d46a052e3a17d0514ed905378b4d1653cbbe696c5d799e032dd7436dd2c8885c
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/moccur-edit/files/60moccur-edit-gentoo.el b/app-emacs/moccur-edit/files/60moccur-edit-gentoo.el
new file mode 100644
index 000000000000..7f1bc222e638
--- /dev/null
+++ b/app-emacs/moccur-edit/files/60moccur-edit-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(eval-after-load "color-moccur"
+ '(require 'moccur-edit))
diff --git a/app-emacs/moccur-edit/metadata.xml b/app-emacs/moccur-edit/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/moccur-edit/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/moccur-edit/moccur-edit-2.16.ebuild b/app-emacs/moccur-edit/moccur-edit-2.16.ebuild
new file mode 100644
index 000000000000..0dc95c200ca5
--- /dev/null
+++ b/app-emacs/moccur-edit/moccur-edit-2.16.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An improved interface to color-moccur for editing"
+HOMEPAGE="http://www.bookshelf.jp/
+ https://www.emacswiki.org/emacs/SearchBuffers"
+# taken from http://www.bookshelf.jp/elc/moccur-edit.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/color-moccur"
+DEPEND="${RDEPEND}"
+
+SITEFILE="60${PN}-gentoo.el"
diff --git a/app-emacs/mode-compile-2.29.1 b/app-emacs/mode-compile-2.29.1
deleted file mode 100644
index 4b8f62be85e8..000000000000
--- a/app-emacs/mode-compile-2.29.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Smart command for compiling files according to major-mode
-EAPI=5
-HOMEPAGE=https://github.com/emacsmirror/mode-compile https://www.emacswiki.org/emacs/ModeCompile
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/emacsmirror/mode-compile/archive/2.29.1.tar.gz -> mode-compile-2.29.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=15119779a3800ff257e955dc527f5615
diff --git a/app-emacs/mode-compile/Manifest b/app-emacs/mode-compile/Manifest
new file mode 100644
index 000000000000..3a82c9d96f7b
--- /dev/null
+++ b/app-emacs/mode-compile/Manifest
@@ -0,0 +1,4 @@
+AUX 50mode-compile-gentoo.el 255 BLAKE2B e460d21b72893ea9e5252dfeedbf37346b19744e43ab53b555b25b069af1eaa0de82412dd8d7b3fc444c16076aa62093c31bb85dad98605c650147584c9a2e65 SHA512 4214eb678ef2ee902bce458f906d19cc90f2d2f793e34e45b98393dc0d6eddd29334bfbdf1983793aa840f827654b093519686bf643a9593df9b0cd5783d4241
+DIST mode-compile-2.29.1.tar.gz 22924 BLAKE2B 7ef71f958ffd5022ddcc64c07ef60822af5bc4a1f5deac5c4e57ce63cd9596d5f612d73eb9cdac627ecfef59e893d795afbeaa19b380b0cc4291bb4dc23fc05c SHA512 bc43d9cae411f5177ce70c736041db74c6db1dc5b766b22b92227e9e1324d304276bd104d8e3cac9ff5a877fc48b6da5b904e1acdb6cca7396fc7c26cc572815
+EBUILD mode-compile-2.29.1.ebuild 466 BLAKE2B b04ecade92aa4d1c5a2ff0b92c94997d1c01bceb5854974d58469106043a3f30755311fb7ffbf69578820a90f63de6cf7fa9f1f13befedf3ae3994df475fea99 SHA512 f1914be874deb0c3348a5e9fc2bcd071bb29bb2a5de4d82823bf777115ec6586bc129a5559df83872802ef87228da6a2bc2fc9e647d7edfc3396c61794749f88
+MISC metadata.xml 369 BLAKE2B 56dfde5c732f5121092dfca54c173eb806d84a4a8248f837253e51f05fdedde6e7b7553c3a407603dc44c4dc60131a57ba63ebc24937e33b661bf6ba0b588dd7 SHA512 fd187a9390a9f11a6ba7ed9c714caa26ef09d1d275c4135b192e476ac3d929e5d947fa507b0d0ea6f7a54a66fccba48df65ea1d887075db59b12976eb5d29ee7
diff --git a/app-emacs/mode-compile/files/50mode-compile-gentoo.el b/app-emacs/mode-compile/files/50mode-compile-gentoo.el
new file mode 100644
index 000000000000..d8dc2734d77a
--- /dev/null
+++ b/app-emacs/mode-compile/files/50mode-compile-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'mode-compile "mode-compile"
+ "Command to compile current buffer file based on the major mode" t)
+(autoload 'mode-compile-kill "mode-compile"
+ "Command to kill a compilation launched by `mode-compile'" t)
diff --git a/app-emacs/mode-compile/metadata.xml b/app-emacs/mode-compile/metadata.xml
new file mode 100644
index 000000000000..1c9e6ccfa517
--- /dev/null
+++ b/app-emacs/mode-compile/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">emacsmirror/mode-compile</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/mode-compile/mode-compile-2.29.1.ebuild b/app-emacs/mode-compile/mode-compile-2.29.1.ebuild
new file mode 100644
index 000000000000..9f05df6283b4
--- /dev/null
+++ b/app-emacs/mode-compile/mode-compile-2.29.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Smart command for compiling files according to major-mode"
+HOMEPAGE="https://github.com/emacsmirror/mode-compile
+ https://www.emacswiki.org/emacs/ModeCompile"
+SRC_URI="https://github.com/emacsmirror/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/mpg123-el-1.59 b/app-emacs/mpg123-el-1.59
deleted file mode 100644
index 9b83167a08ca..000000000000
--- a/app-emacs/mpg123-el-1.59
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs front-end to mpg123 audio player and OggVorbis audio player
-EAPI=5
-HOMEPAGE=http://www.gentei.org/~yuuji/software/mpg123el/
-KEYWORDS=amd64 ppc x86
-LICENSE=mpg123-el
-RDEPEND=media-sound/mpg123 media-sound/alsa-utils >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mpg123-el-1.59.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=6ebd2629c67964303e7956f52b973098
diff --git a/app-emacs/mpg123-el-1.60 b/app-emacs/mpg123-el-1.60
deleted file mode 100644
index 86f4a66e0ba0..000000000000
--- a/app-emacs/mpg123-el-1.60
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs front-end to mpg123 audio player and OggVorbis audio player
-EAPI=6
-HOMEPAGE=http://www.gentei.org/~yuuji/software/mpg123el/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=mpg123-el
-RDEPEND=media-sound/mpg123 media-sound/alsa-utils >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mpg123-el-1.60.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e6099f87b5a6fe83efa5ab70f6c7802c
diff --git a/app-emacs/mpg123-el/Manifest b/app-emacs/mpg123-el/Manifest
new file mode 100644
index 000000000000..20941b0061b8
--- /dev/null
+++ b/app-emacs/mpg123-el/Manifest
@@ -0,0 +1,6 @@
+AUX 50mpg123-el-gentoo.el 121 BLAKE2B db0ee430cca004ac595670289feffb469d121b605696fbacb01dec2422715e557047e29246ebee59b09d5db3b83a8411f70566ce22ee174a4f23296d2958165e SHA512 65b1d2039ce0773a65cf26fc88699ccb6fa26d7db2312ac6a9d0712512c214ba7b5758bd1556365836fdf840bcfc9eedef12f18bcdd1866fde6937777979a032
+DIST mpg123-el-1.59.tar.xz 34076 BLAKE2B ddfd5940665fb11e692958332d1e53cb5adf3e36bd1d178b764ceb2b1a34928fc37ec843e8e1d10d22c9efe4b5de863797be3b3a527d28fad5081ee682ff1d4b SHA512 48fae024529be7b88553fc43fb626253f3d3a10d6709378a565a0d407374569e5573e52c0b26abc4d6f2f51ad7f680d655a1ac15ff696f4534c39a9a3536bc0e
+DIST mpg123-el-1.60.tar.xz 34104 BLAKE2B f48a0ce460ee382b261accaf2188bb1dde7b17b1b09766cda7ef69f92d3e022a4390a7c9e9a97085f1c1e87377d114bcbdb29de512438ee3652baa0be0b413a7 SHA512 5f4d7aefeaec6c5e94dcd5d15af7d0b89dc79274dce117309a70170cd0ec8cafac7c275518ea21d797d9251c31033b93c0581f26f83792c7b697094f4b194611
+EBUILD mpg123-el-1.59.ebuild 837 BLAKE2B 7a76105d7b7b8f36130ebaa72dc79961b145c2cdae25dad4ee10dbc797d27517606ac6b1f9bef2605ca61f69f7d6fdcf27e0e404cb9ab8a224bafe044aca0438 SHA512 952292f953a6a470fc9ea0400cffdbdd4128ef5b3412154695840f559d1e7aae2ac169d54a77ba4e718ad007e24067cf4a0934100da88b7db2d0fbecc586be69
+EBUILD mpg123-el-1.60.ebuild 794 BLAKE2B 80ee206ce8d47c5b6d9db501cef6c050b1c44b9ca5f4d4a71eb116fc4eed5f88bd64cec64b144837b2e17431a6d0f3717b420f76ea72c38bc0c7537bc0c7d8f0 SHA512 e9cbb50ebd06e8c6c4dfa79ba8a175459555f9f907444b6b27ddcb3bae59177295ae04e72ded30136c3d5640f4281840de6eb82b7e71a7c07d9f156b9250538c
+MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/mpg123-el/files/50mpg123-el-gentoo.el b/app-emacs/mpg123-el/files/50mpg123-el-gentoo.el
new file mode 100644
index 000000000000..b65e6b16969d
--- /dev/null
+++ b/app-emacs/mpg123-el/files/50mpg123-el-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'mpg123 "mpg123" "A Front-end to mpg123" t)
+(setq id3*put-prog "tagput")
diff --git a/app-emacs/mpg123-el/metadata.xml b/app-emacs/mpg123-el/metadata.xml
new file mode 100644
index 000000000000..c438baf3b326
--- /dev/null
+++ b/app-emacs/mpg123-el/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 type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-emacs/mpg123-el/mpg123-el-1.59.ebuild b/app-emacs/mpg123-el/mpg123-el-1.59.ebuild
new file mode 100644
index 000000000000..2cffa4ba6c99
--- /dev/null
+++ b/app-emacs/mpg123-el/mpg123-el-1.59.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp toolchain-funcs
+
+DESCRIPTION="Emacs front-end to mpg123 audio player and OggVorbis audio player"
+HOMEPAGE="http://www.gentei.org/~yuuji/software/mpg123el/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="mpg123-el"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="media-sound/mpg123
+ media-sound/alsa-utils"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ sed -i -e "s/\(mainloop:\)/\1 ;/" tagput.c || die
+}
+
+src_compile() {
+ $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tagput tagput.c || die
+ $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o id3put id3put.c || die
+ elisp-compile *.el
+}
+
+src_install() {
+ dobin tagput id3put
+ elisp-install ${PN} *.el *.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/mpg123-el/mpg123-el-1.60.ebuild b/app-emacs/mpg123-el/mpg123-el-1.60.ebuild
new file mode 100644
index 000000000000..f2120eb5c4c2
--- /dev/null
+++ b/app-emacs/mpg123-el/mpg123-el-1.60.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp toolchain-funcs
+
+DESCRIPTION="Emacs front-end to mpg123 audio player and OggVorbis audio player"
+HOMEPAGE="http://www.gentei.org/~yuuji/software/mpg123el/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="mpg123-el"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="media-sound/mpg123
+ media-sound/alsa-utils"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o tagput tagput.c || die
+ $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o id3put id3put.c || die
+ elisp-compile *.el
+}
+
+src_install() {
+ dobin tagput id3put
+ elisp-install ${PN} *.el *.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/mu-cite-8.1_p200709030413 b/app-emacs/mu-cite-8.1_p200709030413
deleted file mode 100644
index 091fffa3d89f..000000000000
--- a/app-emacs/mu-cite-8.1_p200709030413
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Message citation utilities for emacsen
-EAPI=5
-HOMEPAGE=http://www.jpl.org/elips/mu/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-emacs/apel virtual/emacs-flim >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.jpl.org/elips/mu/snapshots/mu-cite-200709030413.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=1c9ca4574331eba118c53ba61eb61403
diff --git a/app-emacs/mu-cite-8.1_p201202272330 b/app-emacs/mu-cite-8.1_p201202272330
deleted file mode 100644
index 5d438563fe32..000000000000
--- a/app-emacs/mu-cite-8.1_p201202272330
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Message citation utilities for emacsen
-EAPI=5
-HOMEPAGE=http://www.jpl.org/elips/mu/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-emacs/apel virtual/emacs-flim >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.jpl.org/elips/mu/snapshots/mu-cite-201202272330.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=1c9ca4574331eba118c53ba61eb61403
diff --git a/app-emacs/mu-cite/Manifest b/app-emacs/mu-cite/Manifest
new file mode 100644
index 000000000000..2091513cefb4
--- /dev/null
+++ b/app-emacs/mu-cite/Manifest
@@ -0,0 +1,6 @@
+AUX 50mu-cite-gentoo.el 142 BLAKE2B f6631cf5bb32bf66af28c56cf21e0dd51ffc545a47ac82edb0db125b78bbf6a183553b6d0afedcde766df0ae349085253f3edb91718b949341a899f01e6f1733 SHA512 737b4c0c5ae0790e7cc8dbf0d253aadf7cd2680c54940967d93f95dbf6fe80fdbf5290560ef4eacfa16c1a26ab9567726228af7b3b649f859c01b021c10563ef
+DIST mu-cite-200709030413.tar.gz 19439 BLAKE2B 279627608af2759ee5fe566c315f8c2be168e0e4a01bc179ae7289f6c990f4a569d59288b02097a3230271ec4c1ba6aefa3db9e46271eb476eb50e912bacc9d0 SHA512 aee355abf8d77ca9ce6d5d2f00e5e8d9a1123b82bb15169bbbdf22c9447c37f1d200ffe1cd05abb61f1011c0d9731d3300d0e5bbf6f10ca6155c00a610a46703
+DIST mu-cite-201202272330.tar.gz 19212 BLAKE2B d52378258b3804e2867d6f8f6f471a73eebb3ff955df70a2ddc5dfd91d6ada2ea2349d44e86c81e1c314b88787b08b39f40238b22760a74b77f8393361aecdcc SHA512 78013bed020c46baeecf56bcd155eb6058d11b1d61a0af55b075454601e3cd1a992bdad887e125ffd569782a38e4509d60efdc431ded501c35da096133b475b8
+EBUILD mu-cite-8.1_p200709030413.ebuild 530 BLAKE2B f308931d0d93012c7201a48ab4ba0871e503aaa78cb122d5423dfdfc53bc8782bf7d98c5bd1b61a55b5fb87b0ed82a9754687cdd77352718f5a8e746d1526a6d SHA512 9139ceff997366d98f6bfec34025d3978faeb629232eeab133369e90cb413802a91465b8e6b98f0b6e998ba27456fda60535178127c30a6d38747e672e987068
+EBUILD mu-cite-8.1_p201202272330.ebuild 530 BLAKE2B f308931d0d93012c7201a48ab4ba0871e503aaa78cb122d5423dfdfc53bc8782bf7d98c5bd1b61a55b5fb87b0ed82a9754687cdd77352718f5a8e746d1526a6d SHA512 9139ceff997366d98f6bfec34025d3978faeb629232eeab133369e90cb413802a91465b8e6b98f0b6e998ba27456fda60535178127c30a6d38747e672e987068
+MISC metadata.xml 375 BLAKE2B 022df13d1d586579ed08af80b893ce2a1a9d1275720ec5d447efca002dd05a5544eaa6c1f01a5d6df2c0e7cf594eacf6a0c1fb840989674f8af537e1468ec6ee SHA512 24ea62246bc2d2c433dd071cf9906fe2f0c9dd834ba4d5bfadbbefcb9d47a063cd07da9c6756043c296c2ae56da39f18714416dab862d5f36fbd2f6100dc663b
diff --git a/app-emacs/mu-cite/files/50mu-cite-gentoo.el b/app-emacs/mu-cite/files/50mu-cite-gentoo.el
new file mode 100644
index 000000000000..d6cf435893d4
--- /dev/null
+++ b/app-emacs/mu-cite/files/50mu-cite-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'mu-cite-original "mu-cite" nil t)
+(add-hook 'mail-citation-hook (function mu-cite-original))
diff --git a/app-emacs/mu-cite/metadata.xml b/app-emacs/mu-cite/metadata.xml
new file mode 100644
index 000000000000..c59c7fc25206
--- /dev/null
+++ b/app-emacs/mu-cite/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/mu-cite/mu-cite-8.1_p200709030413.ebuild b/app-emacs/mu-cite/mu-cite-8.1_p200709030413.ebuild
new file mode 100644
index 000000000000..63f2fdaec660
--- /dev/null
+++ b/app-emacs/mu-cite/mu-cite-8.1_p200709030413.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+MY_P="${PN}-${PV#*_p}"
+DESCRIPTION="Message citation utilities for emacsen"
+HOMEPAGE="http://www.jpl.org/elips/mu/"
+SRC_URI="http://www.jpl.org/elips/mu/snapshots/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/apel
+ virtual/emacs-flim"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog NEWS README.en"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+ emake EMACS=emacs
+}
diff --git a/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild b/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild
new file mode 100644
index 000000000000..63f2fdaec660
--- /dev/null
+++ b/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+MY_P="${PN}-${PV#*_p}"
+DESCRIPTION="Message citation utilities for emacsen"
+HOMEPAGE="http://www.jpl.org/elips/mu/"
+SRC_URI="http://www.jpl.org/elips/mu/snapshots/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/apel
+ virtual/emacs-flim"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog NEWS README.en"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+ emake EMACS=emacs
+}
diff --git a/app-emacs/multi-term-1.3 b/app-emacs/multi-term-1.3
deleted file mode 100644
index 28025dfeeeb1..000000000000
--- a/app-emacs/multi-term-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Manage multiple terminal buffers in Emacs
-EAPI=6
-HOMEPAGE=https://www.emacswiki.org/emacs/MultiTerm
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mjo/distfiles/multi-term-1.3.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=68617363436e516c149d0f96f63aadd1
diff --git a/app-emacs/multi-term/Manifest b/app-emacs/multi-term/Manifest
new file mode 100644
index 000000000000..06c713cef77b
--- /dev/null
+++ b/app-emacs/multi-term/Manifest
@@ -0,0 +1,4 @@
+AUX 50multi-term-gentoo.el 333 BLAKE2B a1b7110690bae34b2ce2f951490f9a614c19adf570efeb1658d71c8bdca620929012ed628613497a04b082fe123c2bdf2df0921bec0252870c05c78b175cf77a SHA512 ec802e28ed8ff19b34eb394be23c5eec1e8a68542574669062048315106d8a814ce3cd6a38713c53b193f5bb66def03c4397e4c606d4380a2be7525e2f348953
+DIST multi-term-1.3.el.xz 7968 BLAKE2B 6cb9a8bec0f2e1ef18229ecbec78a856808f6b3cab3eecc4ba2c78f91adcd687fcca870307c808cc1d0e6c2de71d42effdd0cdf38fc1b97b19511da7aad2be84 SHA512 fcb31da193f84fde653583b999e344fb7ec7404948fbf64b15f9a86eb69e9cc9514ad4380ce5b9c3813a74226d8addf8c87bb539f9ee927d4a0c0a7c2ea7c361
+EBUILD multi-term-1.3.ebuild 439 BLAKE2B 9eafdf4a915629858ae46b41900ea24e07ee8a2c3b735714544b59f27e6308aebed978c0c9bb0973a153c344eccf5b5c826a5261aceb141827a24a7a07c3dde4 SHA512 4eca3e3a42688bb83131e71931b859e6d263d0fea9734d13c4f56c84d77b95a14986efef7ee13ff413494a4965a990acc59ba1604a226341dfc560e508dfc9d4
+MISC metadata.xml 355 BLAKE2B a6fc04ec469257de33a54a8a1fa3bccedaf806fbb6c345677f844e72e128f1558520f577288c858f9bc357b336d3fbdb3408613a4968f1c9ebd19c4f5201bbda SHA512 ce894e3eddb210687ca86d19d547253df7d373cb48a84661dda1b7fbf70c6c6aa80ec4966fd77a305c7ca377181e66fa6c6be136bf7b5e40abc132c1ffc42e8b
diff --git a/app-emacs/multi-term/files/50multi-term-gentoo.el b/app-emacs/multi-term/files/50multi-term-gentoo.el
new file mode 100644
index 000000000000..0552079e24d9
--- /dev/null
+++ b/app-emacs/multi-term/files/50multi-term-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'multi-term "multi-term"
+ "Create new term buffer.
+Will prompt you shell name when you type `C-u' before this command." t)
+(autoload 'multi-term-dedicated-open "multi-term"
+ "Open dedicated `multi-term' window.
+Will prompt you shell name when you type `C-u' before this command." t)
diff --git a/app-emacs/multi-term/metadata.xml b/app-emacs/multi-term/metadata.xml
new file mode 100644
index 000000000000..76d7cdf76dc7
--- /dev/null
+++ b/app-emacs/multi-term/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>mjo@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/multi-term/multi-term-1.3.ebuild b/app-emacs/multi-term/multi-term-1.3.ebuild
new file mode 100644
index 000000000000..c6c77f56ca03
--- /dev/null
+++ b/app-emacs/multi-term/multi-term-1.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Manage multiple terminal buffers in Emacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/MultiTerm"
+# Taken from http://www.emacswiki.org/emacs/download/${PN}.el
+SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/multiple-cursors-1.3.0 b/app-emacs/multiple-cursors-1.3.0
deleted file mode 100644
index d71bd589bd8e..000000000000
--- a/app-emacs/multiple-cursors-1.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Multiple cursors for Emacs
-EAPI=5
-HOMEPAGE=https://github.com/magnars/multiple-cursors.el
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/magnars/multiple-cursors.el/archive/1.3.0.tar.gz -> multiple-cursors-1.3.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=539232a5b28df0e146473b41ec4fd010
diff --git a/app-emacs/multiple-cursors/Manifest b/app-emacs/multiple-cursors/Manifest
new file mode 100644
index 000000000000..23c8fdbd9776
--- /dev/null
+++ b/app-emacs/multiple-cursors/Manifest
@@ -0,0 +1,4 @@
+AUX 50multiple-cursors-gentoo.el 80 BLAKE2B 90614e49e4e09b48bc2e34a9f7f2a33fdf3090ede9af2f48d297a88c9531031b4aa73213659780f3b1de49d18da7c35f5c78a9ec4393d85cd92c607f781d89ac SHA512 3c5a03d2cd864fdaa43bdbce47884b189abac77ba99cf57cfe2a6bc2c65cf3f32d45739832ec30613d884a01a08547cb80a028eb6b9a93329ea690ef57230fa7
+DIST multiple-cursors-1.3.0.tar.gz 25880 BLAKE2B b0578299fc1e700ec627f1cdcf153e47d0c32df3374db2bad0d88a76933b0253de61f4670ff155fe6cb7d92d43204d47ffd44d8b90f093fee64a18ee3085049b SHA512 2d321f9016b78aeb37507071756781c84b576a0fbefa385474c8c6287c989412b72b83dfdbe79bc0da1485893ea01952b6e0d392573386338db9e8728f722259
+EBUILD multiple-cursors-1.3.0.ebuild 504 BLAKE2B 1f1f6ac2d7cce30dca0e271a0d757e4b81a88348dc7cd6e78d7fa7bf6c74645a6c9b43ec22f574aa625dec56032561b28784ed2faac7300b35bdcac1e303271b SHA512 251e358812df5ae3a05d9a3081ebad1d02ae7386693b39ed37e417268cb7181d067b767c763b6cf8ec9ed8e4702171bd42260b03fa96147550d5afc26bc1da77
+MISC metadata.xml 372 BLAKE2B 9e5668003abdd4f8688521568299c96a139226432f1d35248056ca624bc558feb833c20a2ade9a946eb7436eabafc1b4c289995c192d543d3f48e4066c6245c0 SHA512 392d223ae60d3b40f0bd46ec369e53753f72872352885201b2b7a83262d0ec73c584746dd110f69b86c72e81415d47af9e72fd277157135565c953b11915fb27
diff --git a/app-emacs/multiple-cursors/files/50multiple-cursors-gentoo.el b/app-emacs/multiple-cursors/files/50multiple-cursors-gentoo.el
new file mode 100644
index 000000000000..e35cdf096a56
--- /dev/null
+++ b/app-emacs/multiple-cursors/files/50multiple-cursors-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "multiple-cursors-autoloads" nil t)
diff --git a/app-emacs/multiple-cursors/metadata.xml b/app-emacs/multiple-cursors/metadata.xml
new file mode 100644
index 000000000000..70aa13d13aeb
--- /dev/null
+++ b/app-emacs/multiple-cursors/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">magnars/multiple-cursors.el</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/multiple-cursors/multiple-cursors-1.3.0.ebuild b/app-emacs/multiple-cursors/multiple-cursors-1.3.0.ebuild
new file mode 100644
index 000000000000..860848f016ef
--- /dev/null
+++ b/app-emacs/multiple-cursors/multiple-cursors-1.3.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Multiple cursors for Emacs"
+HOMEPAGE="https://github.com/magnars/multiple-cursors.el"
+SRC_URI="https://github.com/magnars/${PN}.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
+
+src_compile() {
+ elisp-compile *.el
+ elisp-make-autoload-file
+}
diff --git a/app-emacs/muse-3.20 b/app-emacs/muse-3.20
deleted file mode 100644
index 3a6391615c83..000000000000
--- a/app-emacs/muse-3.20
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=test? ( app-emacs/htmlize ) >=virtual/emacs-23
-DESCRIPTION=An authoring and publishing environment for Emacs
-EAPI=4
-HOMEPAGE=http://mwolson.org/projects/EmacsMuse.html
-IUSE=test
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=GPL-3 FDL-1.2 GPL-2 MIT
-RDEPEND=>=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.gna.org/muse-el/muse-3.20.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=786cec026029bd3dcad409eacfa548ed
diff --git a/app-emacs/muse/Manifest b/app-emacs/muse/Manifest
new file mode 100644
index 000000000000..c341a6a05b40
--- /dev/null
+++ b/app-emacs/muse/Manifest
@@ -0,0 +1,4 @@
+AUX 50muse-gentoo.el 64 BLAKE2B 1af4c3cb29edfe7f0263b2eefb1483c2f680a4199c1ec27ae7b4db26f7923d86418b3b3a87fdfae90edff728fa20cf628075a320985bde0a132d1bc864e2ad49 SHA512 c4b1049b70cd62c2490621d123227e5cc62d80c8a2fa3575d69443ec09e5fbb6294b1f3b3dda530139d9318610bc3c806f3984ae697e246778aab5aad0bbc632
+DIST muse-3.20.tar.gz 411316 BLAKE2B a67c72a470e7e2d75cf94ed262b0e9503166326666a119f41968a603b4e48f3527705691a1b4b819ae6ec69c382a09074eef74ddad598faa08be6c74793b1e97 SHA512 23cd0e864586f907418753bc3284afde51b4f8559c5d043c52baa70de70ec4a845d9e8362b93e701308dbbd662e3429035df8ad440916e61d5909498cd55f7be
+EBUILD muse-3.20.ebuild 798 BLAKE2B c1e1bfa6ee31439f39693a20edd4e6ae3fce0ecbde857fdbfae4972f5eaa85bfbf390e8e69cf01a5e88218e10139ce276101a466d41db738aa569273932892d4 SHA512 73f3d55410e94b60f40be8ddf8ce9e64e19534e26f67326bfa06d88bfae7d624026e56d1167484da5a70741ff8656f3c74fcc96b1e34c92eb4705a2c7e310856
+MISC metadata.xml 1573 BLAKE2B df1f66340b61bf97f534274155310fabbfaa2ae8b4cf64f1bd1cba27b38ca4bc1d9f7a5ea4e6c9c74e02ba333a81638c97a8cd0cf540a3433182cfce02f26b5a SHA512 e61095db5b26acf2fdd0143cffe5146a4d1755ce3a2a5fb27041d94b0f76d09c1423af83b3d65caae3ac784f6155c8ee0bcde05e3c6f3a02e677aeeda5435aea
diff --git a/app-emacs/muse/files/50muse-gentoo.el b/app-emacs/muse/files/50muse-gentoo.el
new file mode 100644
index 000000000000..63bea6e9b3ed
--- /dev/null
+++ b/app-emacs/muse/files/50muse-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'muse-autoloads)
diff --git a/app-emacs/muse/metadata.xml b/app-emacs/muse/metadata.xml
new file mode 100644
index 000000000000..2e78cfd4f883
--- /dev/null
+++ b/app-emacs/muse/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ Emacs Muse is an authoring and publishing environment for Emacs.
+ It simplifies the process of writing documents and publishing them
+ to various output formats.
+
+ Muse consists of two main parts: an enhanced text-mode for authoring
+ documents and navigating within Muse projects, and a set of
+ publishing styles for generating different kinds of output.
+
+ This idea is not in any way new. Numerous systems exist - even one
+ other for Emacs itself (Bhl Mode). What Muse adds to the picture is
+ a more modular environment, with a rather simple core, in which
+ "styles" are derived from to create new styles. Much of Muse's
+ overall functionality is optional. For example, you can use the
+ publisher without the major-mode, or the mode without doing any
+ publishing; or if you don't load the Texinfo or LaTeX modules, those
+ styles won't be available.
+
+ The Muse codebase is a departure from emacs-wiki.el version 2.44.
+ The code has been restructured and rewritten, especially its
+ publishing functions. The focus in this revision is on the authoring
+ and publishing aspects, and the "wikiness" has been removed as a
+ default behavior (available as the optional module muse-wiki.el).
+ CamelCase words are no longer special by default.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/muse/muse-3.20.ebuild b/app-emacs/muse/muse-3.20.ebuild
new file mode 100644
index 000000000000..0b93b90bc77b
--- /dev/null
+++ b/app-emacs/muse/muse-3.20.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="An authoring and publishing environment for Emacs"
+HOMEPAGE="http://mwolson.org/projects/EmacsMuse.html"
+SRC_URI="http://download.gna.org/muse-el/${P}.tar.gz"
+
+LICENSE="GPL-3 FDL-1.2 GPL-2 MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE="test"
+RESTRICT="test" #426546
+
+DEPEND="test? ( app-emacs/htmlize )"
+RDEPEND=""
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ default
+}
+
+src_install() {
+ elisp-install ${PN} lisp/*.el lisp/*.elc || die
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ doinfo texi/muse.info
+ dodoc AUTHORS NEWS README ChangeLog*
+ insinto /usr/share/doc/${PF}
+ doins -r contrib etc examples experimental scripts
+}
diff --git a/app-emacs/nagios-mode-0.3 b/app-emacs/nagios-mode-0.3
deleted file mode 100644
index 2b8bb70445f8..000000000000
--- a/app-emacs/nagios-mode-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Major mode for editing Nagios configuration files
-EAPI=4
-HOMEPAGE=http://michael.orlitzky.com/code/nagios-mode.php
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://michael.orlitzky.com/code/releases/nagios-mode-0.3.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=5aa3ef0fb9e20d021d212835860a5b5d
diff --git a/app-emacs/nagios-mode/Manifest b/app-emacs/nagios-mode/Manifest
new file mode 100644
index 000000000000..76c83e44d996
--- /dev/null
+++ b/app-emacs/nagios-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50nagios-mode-gentoo.el 195 BLAKE2B 9462de25d1de1f9c0d972841339dac53458b6534bfe76b744312b4f0af8063fcdf11fe3d404c49bdf4ede28550d0390b6e3ff1d7068c9bc8f30d4454f117bbc5 SHA512 07e3dfbf4b4142b6b6bbf4138c76b9252f94b9cc1c25f2eaeb9cfddf2294995ffd5fbf40b6bdc032320f94dc93e8463cb270ef841ee11424939dcf5889a54fe1
+DIST nagios-mode-0.3.tar.gz 7917 BLAKE2B 17f69dd9736b5a3f94a69ef2af7827503d2ee87f97346e5ead44563d1e056457bb425f0145b58246dafebbb0fd346857e5fe9aa11a616c8e6608722013a73500 SHA512 e9ff6e0684ee0f9f1919ec9dd4c8e0dfa7faab347f56724f7fe69bc366cf8d81f98c4c4245ddde95bbf9a2b9f72fec80a100c22b6b0b9e3c28c999515d0b6a50
+EBUILD nagios-mode-0.3.ebuild 453 BLAKE2B 20c8e87cf76c917447bdffc285a714a93730c5cc4d59ed9375c9b49aaaa02336e4ce8c3e714063527e3500ab3dcae5f5bfd0ae9859baef9bf1da353a34331bbb SHA512 39ff8f5ee30350407cf6d03bfcdb8adda2baeff902ecbf5e4fafc81724b0f2499d6238f691102e360225dbe77e0d7dd376be5105a8503f3a64b9f1da88119eab
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/nagios-mode/files/50nagios-mode-gentoo.el b/app-emacs/nagios-mode/files/50nagios-mode-gentoo.el
new file mode 100644
index 000000000000..d74ed9de7461
--- /dev/null
+++ b/app-emacs/nagios-mode/files/50nagios-mode-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'nagios-mode "nagios-mode"
+ "Major mode for editing Nagios configuration files." t)
+;;(add-to-list 'auto-mode-alist '("\\.cfg\\'" . nagios-mode))
diff --git a/app-emacs/nagios-mode/metadata.xml b/app-emacs/nagios-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/nagios-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/nagios-mode/nagios-mode-0.3.ebuild b/app-emacs/nagios-mode/nagios-mode-0.3.ebuild
new file mode 100644
index 000000000000..d8df07e7fb29
--- /dev/null
+++ b/app-emacs/nagios-mode/nagios-mode-0.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Major mode for editing Nagios configuration files"
+HOMEPAGE="http://michael.orlitzky.com/code/nagios-mode.php"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE=""
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog README test_suite.cfg"
diff --git a/app-emacs/navi2ch-1.8.4-r1 b/app-emacs/navi2ch-1.8.4-r1
deleted file mode 100644
index b54659b0a44b..000000000000
--- a/app-emacs/navi2ch-1.8.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A navigator for the Japanese textboard 2ch
-EAPI=6
-HOMEPAGE=http://navi2ch.sourceforge.net/
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://sourceforge/navi2ch/navi2ch-1.8.4.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=359774a25ee966f5690be38cc758152a
diff --git a/app-emacs/navi2ch/Manifest b/app-emacs/navi2ch/Manifest
new file mode 100644
index 000000000000..28179a0b6fa4
--- /dev/null
+++ b/app-emacs/navi2ch/Manifest
@@ -0,0 +1,4 @@
+AUX 50navi2ch-gentoo.el 101 BLAKE2B 2747e516952995f06fd72ff022ea62a8270c3556bc9ea02c8467d3c75ac7f3b40bd8a8e6dba3bbfb6725307380196cc1772556fbec41cb2b6dac4b15beb81bfe SHA512 c7efdd0ef06c613628340a4f6f3a1a249e137eafb75542967b4a15c1114260375c9c527fc4e037c98041520d6771f03500f1e37b3d8392b67f6d3509a4a501fc
+DIST navi2ch-1.8.4.tar.gz 470499 BLAKE2B 55cc673365ac174de9d3919dc8579c76b0f1e2901c3e50b0c24d7b9b81c8ae2090e6b534e779c2a67a9b2bb1f693c3435dffe165a4a05516202be1edd507006d SHA512 3028ea05c1e264f734f5a7578a0eb7e7aa5f23dbe33ccf9b0659344dbbb36c140842100923bb77e82614307e9793fb73e2bff42d6308438410d80102e33a3184
+EBUILD navi2ch-1.8.4-r1.ebuild 1190 BLAKE2B 58e03de4b3ba7880f3df232cd2466306870b9d38db690eb338d474d7c3408226e3a7c51094a28d2af8b07c650843a5bbefe05a84eafd744fe019f05244bfc6b2 SHA512 5a9a78ce0bb4fe351e30d04fc06b90559d7e6d0ecbde75653423692c6fd935a7c7d9aa3913150ba6bd27835e07e07632eee4c3e97538771e38ca008387e101fe
+MISC metadata.xml 450 BLAKE2B 7ebdf8a60c8dbe180608e73615a3f2c72759aa86a05008afef17967bffb0b506a035aa989da12bccc4229551bcc9d28b4a2b0e5e7e3f2e8bfd4bd571550cfdaa SHA512 a14cf54cfb78730c3805a9b4ae3b27545f0954711a4fc40dbd6daeccd59cf0a0a539a92543554c3ab6e97ca2cc8365aab6a5688f8d41167f77317a685c48b1c4
diff --git a/app-emacs/navi2ch/files/50navi2ch-gentoo.el b/app-emacs/navi2ch/files/50navi2ch-gentoo.el
new file mode 100644
index 000000000000..512b80d45248
--- /dev/null
+++ b/app-emacs/navi2ch/files/50navi2ch-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'navi2ch "navi2ch" "Navigator for 2ch for Emacs." t)
diff --git a/app-emacs/navi2ch/metadata.xml b/app-emacs/navi2ch/metadata.xml
new file mode 100644
index 000000000000..48ac9d6ac97e
--- /dev/null
+++ b/app-emacs/navi2ch/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">navi2ch</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/navi2ch/navi2ch-1.8.4-r1.ebuild b/app-emacs/navi2ch/navi2ch-1.8.4-r1.ebuild
new file mode 100644
index 000000000000..c18d019a8908
--- /dev/null
+++ b/app-emacs/navi2ch/navi2ch-1.8.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="A navigator for the Japanese textboard 2ch"
+HOMEPAGE="http://navi2ch.sourceforge.net/"
+SRC_URI="mirror://sourceforge/navi2ch/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+ econf \
+ --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-icondir="${EPREFIX}${SITEETC}/${PN}"
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ elisp-install ${PN} contrib/*.el
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc ChangeLog* NEWS README TODO
+ newdoc contrib/README README.contrib
+
+ DOC_CONTENTS="Please add the following lines to your ~/.emacs file:
+ \n\nIf you use mona-font:
+ \n\t(setq navi2ch-mona-enable t)
+ \nIf you use izonmoji-mode:
+ \n\t(require 'izonmoji-mode)
+ \n\t(add-hook 'navi2ch-bm-mode-hook 'izonmoji-mode-on)
+ \n\t(add-hook 'navi2ch-article-mode-hook 'izonmoji-mode-on)
+ \n\t(add-hook 'navi2ch-popup-article-mode-hook 'izonmoji-mode-on)"
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/nxml-docbook5-schemas-20080922 b/app-emacs/nxml-docbook5-schemas-20080922
deleted file mode 100644
index 83631634811d..000000000000
--- a/app-emacs/nxml-docbook5-schemas-20080922
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Add support for DocBook 5 schemas to NXML
-EAPI=4
-HOMEPAGE=http://www.docbook.org/schemas/5x.html
-KEYWORDS=amd64 x86
-LICENSE=HPND
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.docbook.org/xml/5.0/rng/docbookxi.rnc
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=a85f9f24520d9c2f44c2008d4d215a1c
diff --git a/app-emacs/nxml-docbook5-schemas/Manifest b/app-emacs/nxml-docbook5-schemas/Manifest
new file mode 100644
index 000000000000..bdc84e38682c
--- /dev/null
+++ b/app-emacs/nxml-docbook5-schemas/Manifest
@@ -0,0 +1,5 @@
+AUX 60nxml-docbook5-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
+AUX schemas.xml 198 BLAKE2B 723ce69dc7b0e63267b0e7b93965ad238b9a919f088aa5dd7611a84c7ebe0a053ae5d8e33ddd6dbf6584f6a9a5406cdf2c727c00907dbd8d5da344405c47bfe2 SHA512 1f41a1e907ae92637845803cdc0c569ad444c9c03a0ba5d9c3f909d42e41353a84f20ca50dbf4f49c0f96836af5c0d5ff0b1f034dbb9b8a45f6083a3ae955ada
+DIST docbookxi.rnc 292523 BLAKE2B 13ae2f3756485845e2fc6dca87bce5eb12c419c84b6edaab5051b075700387c32904f54286756c5fed2480c17af00e385845105a94b13ced9fe13ba959e22224 SHA512 13309beb2dbf76168889a962782d3dd1849fb254ebf1941ffd4fcfc272353ba0ddece509a9b74250462b3e1eff12f31fc408aa790e0efea01d527482b3fa3a48
+EBUILD nxml-docbook5-schemas-20080922.ebuild 586 BLAKE2B 107ad2114cb166c515237fd07c48700a3a69a0149d03a299fab73691f2b64b2994ed00cb69ea9b4e9ec3bee02aeb84a5e59b958436e713ec47f876d050ccb1c0 SHA512 2f17befae09d09e81e9a2b98d86a9d5bf479d6f5de74e8bbedace24f1c974917b1a1b7af2ff17c6b2619023dae8087010912c492d7893a37d2ce9974269a0579
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/nxml-docbook5-schemas/files/60nxml-docbook5-schemas-gentoo.el b/app-emacs/nxml-docbook5-schemas/files/60nxml-docbook5-schemas-gentoo.el
new file mode 100644
index 000000000000..c574746e6576
--- /dev/null
+++ b/app-emacs/nxml-docbook5-schemas/files/60nxml-docbook5-schemas-gentoo.el
@@ -0,0 +1,5 @@
+;; This must be executed after rng-schema-locating-files
+;; is set in rng-loc (which is part of nxml-mode).
+(eval-after-load "rng-loc"
+ '(add-to-list 'rng-schema-locating-files
+ "@SITEETC@/schemas.xml"))
diff --git a/app-emacs/nxml-docbook5-schemas/files/schemas.xml b/app-emacs/nxml-docbook5-schemas/files/schemas.xml
new file mode 100644
index 000000000000..c114447627a9
--- /dev/null
+++ b/app-emacs/nxml-docbook5-schemas/files/schemas.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
+ <namespace ns="http://docbook.org/ns/docbook" uri="docbookxi.rnc"/>
+</locatingRules>
diff --git a/app-emacs/nxml-docbook5-schemas/metadata.xml b/app-emacs/nxml-docbook5-schemas/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/nxml-docbook5-schemas/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-20080922.ebuild b/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-20080922.ebuild
new file mode 100644
index 000000000000..c136f7675203
--- /dev/null
+++ b/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-20080922.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Add support for DocBook 5 schemas to NXML"
+HOMEPAGE="http://www.docbook.org/schemas/5x.html"
+SRC_URI="http://www.docbook.org/xml/5.0/rng/docbookxi.rnc"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+S="${WORKDIR}"
+SITEFILE="60${PN}-gentoo.el"
+
+src_unpack() { :; }
+
+src_compile() { :; }
+
+src_install() {
+ insinto ${SITEETC}/${PN}
+ doins "${FILESDIR}"/schemas.xml "${DISTDIR}"/docbookxi.rnc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/nxml-gentoo-schemas-20170302 b/app-emacs/nxml-gentoo-schemas-20170302
deleted file mode 100644
index 29870a1460db..000000000000
--- a/app-emacs/nxml-gentoo-schemas-20170302
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Extension for nxml-mode with Gentoo-specific schemas
-EAPI=6
-HOMEPAGE=https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=HPND
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20170302.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=95da40e82ccf2e7f44697bb4af120db8
diff --git a/app-emacs/nxml-gentoo-schemas-20180611 b/app-emacs/nxml-gentoo-schemas-20180611
deleted file mode 100644
index 9ab5edc0a1ee..000000000000
--- a/app-emacs/nxml-gentoo-schemas-20180611
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=virtual/emacs-23
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=Extension for nxml-mode with Gentoo-specific schemas
-EAPI=7
-HOMEPAGE=https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=HPND
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20180611.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=cf324e107eb80e512fb846accccb6d18
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
new file mode 100644
index 000000000000..899f66139a6e
--- /dev/null
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -0,0 +1,6 @@
+AUX 60nxml-gentoo-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
+DIST nxml-gentoo-schemas-20170302.tar.xz 11496 BLAKE2B 34e3517a6c57980f0a349e6c0a659ff8cbc38ade3a1cf2fd36ef7179e841de38eb73bbd85c65cf8e284f5b58583f850fd9e9622699c8dd5a909d2aa5a756164a SHA512 34f02d2b5e3decad51b4d5801826cf0f7a7e863a1f61a529d3d53dc38d0a687cf100da8007c9dd1ee2172dc22af3dc963dddf3c8fefcdc47db616261d8f2f259
+DIST nxml-gentoo-schemas-20180611.tar.xz 11572 BLAKE2B e8a573e79d9531d676b8c52ba9c2869f765e6bb0326f3f00c99dd3ecfd19af6eaedbb06ddf84ae541690962a5e67b87726d6cc90a3bf7dd6d805b5c2c96b6321 SHA512 8473233141a56935e41a9d0371501f3fe055b21600746db29e14ec91d12a43da595e500a876eea8cdddd885358df0825055143e901eb599a2fcbac7147a04fa8
+EBUILD nxml-gentoo-schemas-20170302.ebuild 579 BLAKE2B f57c3558ac46061dfe25a7a7b7f2c4a60bf580423299ca4f83ceb701350b1aeba7d73231fbcf22d96160367c2dcf5f4eef382d9ce054425727bc21736d8aece9 SHA512 84835c6ceda08c30d3572b92106b1d0eab5e296c10b5e9110b99b89542d737b0c4b8d9cb8a4f9c9cbabd99cf5d1f562d1f0a79631b740a411364ca49ef0abc26
+EBUILD nxml-gentoo-schemas-20180611.ebuild 579 BLAKE2B 8938baf746880318ca5bb64bd8ca510311dab35b8f103d6dd92c3b93153b2239a962b160eb9d944a9fa2b55072c49c18266488238a0950b8c9e9e568316ffd9d SHA512 cfb578c94d9d2ebc97ece8d009527988b6bab54f2e5662ca96c50652cbc618de2aa82821c496eb9c4938840543ba039c1544087b3ce4e57c4c936ada0344db02
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/nxml-gentoo-schemas/files/60nxml-gentoo-schemas-gentoo.el b/app-emacs/nxml-gentoo-schemas/files/60nxml-gentoo-schemas-gentoo.el
new file mode 100644
index 000000000000..c574746e6576
--- /dev/null
+++ b/app-emacs/nxml-gentoo-schemas/files/60nxml-gentoo-schemas-gentoo.el
@@ -0,0 +1,5 @@
+;; This must be executed after rng-schema-locating-files
+;; is set in rng-loc (which is part of nxml-mode).
+(eval-after-load "rng-loc"
+ '(add-to-list 'rng-schema-locating-files
+ "@SITEETC@/schemas.xml"))
diff --git a/app-emacs/nxml-gentoo-schemas/metadata.xml b/app-emacs/nxml-gentoo-schemas/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/nxml-gentoo-schemas/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20170302.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20170302.ebuild
new file mode 100644
index 000000000000..77807012f4cc
--- /dev/null
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20170302.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
+HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() { :; }
+
+src_install() {
+ insinto "${SITEETC}/${PN}"
+ doins schemas.xml *.rnc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc DONATING
+}
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20180611.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20180611.ebuild
new file mode 100644
index 000000000000..e7f0519c8d6c
--- /dev/null
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20180611.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
+HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() { :; }
+
+src_install() {
+ insinto "${SITEETC}/${PN}"
+ doins schemas.xml *.rnc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc DONATING
+}
diff --git a/app-emacs/nxml-libvirt-schemas-0.9.7 b/app-emacs/nxml-libvirt-schemas-0.9.7
deleted file mode 100644
index 557cc36fb4dd..000000000000
--- a/app-emacs/nxml-libvirt-schemas-0.9.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-text/trang >=virtual/emacs-23
-DESCRIPTION=Extension for nxml-mode with libvirt schemas
-EAPI=4
-HOMEPAGE=http://www.libvirt.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://libvirt.org/sources/libvirt-0.9.7.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a81945731cb659d17938e5be416f6834
diff --git a/app-emacs/nxml-libvirt-schemas-1.2.1 b/app-emacs/nxml-libvirt-schemas-1.2.1
deleted file mode 100644
index a963e4853949..000000000000
--- a/app-emacs/nxml-libvirt-schemas-1.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-text/trang >=virtual/emacs-23
-DESCRIPTION=Extension for nxml-mode with libvirt schemas
-EAPI=5
-HOMEPAGE=http://www.libvirt.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://libvirt.org/sources/libvirt-1.2.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=abb77aa0bb782b9e9bf745f77fb6e2ef
diff --git a/app-emacs/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
new file mode 100644
index 000000000000..c20b7d3aeee2
--- /dev/null
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -0,0 +1,8 @@
+AUX 60nxml-libvirt-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
+AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf204c43bbea5db01626847af7ab96854efcbcc34e7fe9b1c32873ad22ef13873a1a06790e9580371d SHA512 3544959cc57ce1b273e4b9de95f51e1e21d23cc35fb48e02f179a055a61ee9092efdc43405f72c3aacb3c74eada7fabf5952eb49e3ff0514fd69a3092268dc4f
+AUX schemas.xml 560 BLAKE2B 32f01d2dd047aa7109112b47155a21825686385845fae2af0f6d052dbd36f3e1ca5027ec39d654735e390ef9aa8a31f7ae5c86b15b0cd9c4ef84128326e87ee9 SHA512 82ef6189610fc4e1a0d5546ae15f2f315e7c0d460fa141201c43a93e59d147613c7186302fdc3e6b2f0ec5c343e5566966892d4e9f55dc4957e4ad58793fc3ff
+DIST libvirt-0.9.7.tar.gz 17853636 BLAKE2B d149fe4f095c76d003bdca1a307e588a9bd1b011b34119e90b8875837ced533caa2f05f2b9e7709d13f5af0a078fdc4779b7fc8a247f7ca04ad490b18fe728c5 SHA512 ac082f3872b37fc7aad891ba3f2a9614bdc85123b3d626fc7a2e43327a7ec346a0ec154c25161592a4337e3f694d9b27d031544190dec7d6086343f15fe9ba2d
+DIST libvirt-1.2.1.tar.gz 27228694 BLAKE2B 5552508f87bddbd8d2dd65a37298f7f7e7238a7ac5aeef878bd8b3c6d5ecab8f2cf6fb94c8d520312b6c6399f1e663f8d68febf2badd544020635df841f5488f SHA512 6184840623156ca01ee7f59078ebf031bc84c25b37bb110372c7bcf230a79b74e267475f989fb73db5e3c096dcc74f03cb30adfc5de022f756ed2cd6ab05bfd0
+EBUILD nxml-libvirt-schemas-0.9.7.ebuild 1293 BLAKE2B eb3c85bbd2f35c7d02a0d81f25aa5abc1c69b4c75ce6a40647d455c9f2ae19ef8be55a7ec50aac62964197d43f84be4148fa7c94438fda69a650050c7a786f78 SHA512 1cf461b494a820e22b870620dccab37ae225361ab6406b5d22c7b1c04a6291175ef52d081cdffc5146f5865e1b2342d8345e2bf4e36d9eb9e2bc06161627de55
+EBUILD nxml-libvirt-schemas-1.2.1.ebuild 1293 BLAKE2B 6dda0f1cfff26b8f85c21178ff5df4b6259ae982b6c4a2b5423d4bbc54410c2c118461aa56d4f9bdcdd34ff66ff5a772d2cf93bcca66f39ebe56bf65c21071b2 SHA512 265f6a389fc41b15d31fb257a77c7b7fe5e7796988b3aea592c5f2cf09fdcd321e151cd09ec2cbeb2403ddd86cf1029b0598264ff4fa0e764d58a73e813701a6
+MISC metadata.xml 389 BLAKE2B 5874fa7fb23c84408f3e1c975b11cfe88067da63a91d93447f26c682d868ad822e092a186a14cb17d3ca48f8543b64c86ea0086cc26d434e3b5d03e1bd0a5e26 SHA512 5def622fb849779446a7026e11f2f9216c70da203712c4611ac21b0c487adb050159a7775906da34184bed12e4d12033e730722d152670524b4c29bd422f9307
diff --git a/app-emacs/nxml-libvirt-schemas/files/60nxml-libvirt-schemas-gentoo.el b/app-emacs/nxml-libvirt-schemas/files/60nxml-libvirt-schemas-gentoo.el
new file mode 100644
index 000000000000..c574746e6576
--- /dev/null
+++ b/app-emacs/nxml-libvirt-schemas/files/60nxml-libvirt-schemas-gentoo.el
@@ -0,0 +1,5 @@
+;; This must be executed after rng-schema-locating-files
+;; is set in rng-loc (which is part of nxml-mode).
+(eval-after-load "rng-loc"
+ '(add-to-list 'rng-schema-locating-files
+ "@SITEETC@/schemas.xml"))
diff --git a/app-emacs/nxml-libvirt-schemas/files/Makefile-trang b/app-emacs/nxml-libvirt-schemas/files/Makefile-trang
new file mode 100644
index 000000000000..699cf676ff45
--- /dev/null
+++ b/app-emacs/nxml-libvirt-schemas/files/Makefile-trang
@@ -0,0 +1,6 @@
+# -*- makefile -*-
+
+all: $(patsubst %.rng,%.rnc,$(wildcard *.rng))
+
+%.rnc: %.rng
+ trang -I rng -O rnc $< $@
diff --git a/app-emacs/nxml-libvirt-schemas/files/schemas.xml b/app-emacs/nxml-libvirt-schemas/files/schemas.xml
new file mode 100644
index 000000000000..47936ab24a16
--- /dev/null
+++ b/app-emacs/nxml-libvirt-schemas/files/schemas.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
+ <!-- As far as I can see there is no way to apply more than one to
+ search for a file, so we're going to use some very generic
+ locating rules yes it's bad, but upstream libvirt doesn't
+ intend to change that anytime soon.
+ -->
+
+ <documentElement localName="domain" uri="domain.rnc" />
+ <documentElement localName="pool" uri="storagepool.rnc" />
+ <documentElement localName="network" uri="network.rnc" />
+</locatingRules>
diff --git a/app-emacs/nxml-libvirt-schemas/metadata.xml b/app-emacs/nxml-libvirt-schemas/metadata.xml
new file mode 100644
index 000000000000..95fec7fcdfc1
--- /dev/null
+++ b/app-emacs/nxml-libvirt-schemas/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>virtualization@gentoo.org</email>
+ <name>Gentoo Virtualization Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild
new file mode 100644
index 000000000000..9a8a326fa0db
--- /dev/null
+++ b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+#BACKPORTS=
+
+inherit elisp eutils
+
+MY_P="libvirt-${PV/_rc/-rc}"
+
+DESCRIPTION="Extension for nxml-mode with libvirt schemas"
+HOMEPAGE="http://www.libvirt.org/"
+SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
+ ${BACKPORTS:+mirror://gentoo/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
+
+# This is the license of the package, but the schema files are
+# provided without license, maybe it's bad.
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Yes this requires Java, but I'd rather not repackage this, if you
+# know something better in C, I'll be glad to use that.
+DEPEND="app-text/trang"
+RDEPEND=""
+
+SITEFILE="60${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P%-rc*}"
+
+src_prepare() {
+ if [[ -d "${WORKDIR}/patches" ]]; then
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}/patches" \
+ epatch
+ fi
+}
+
+src_compile() {
+ emake -C docs/schemas -f "${FILESDIR}/Makefile-trang"
+}
+
+src_test() {
+ # No we don't need tests here... trang will take care of checking
+ # the well-formedness of the schema files for us
+ :
+}
+
+src_install() {
+ insinto ${SITEETC}/${PN}
+ doins "${FILESDIR}/schemas.xml" docs/schemas/*.rnc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild
new file mode 100644
index 000000000000..7c423e6fa2ed
--- /dev/null
+++ b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#BACKPORTS=
+
+inherit elisp eutils
+
+MY_P="libvirt-${PV/_rc/-rc}"
+
+DESCRIPTION="Extension for nxml-mode with libvirt schemas"
+HOMEPAGE="http://www.libvirt.org/"
+SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
+ ${BACKPORTS:+mirror://gentoo/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
+
+# This is the license of the package, but the schema files are
+# provided without license, maybe it's bad.
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Yes this requires Java, but I'd rather not repackage this, if you
+# know something better in C, I'll be glad to use that.
+DEPEND="app-text/trang"
+RDEPEND=""
+
+SITEFILE="60${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P%-rc*}"
+
+src_prepare() {
+ if [[ -d "${WORKDIR}/patches" ]]; then
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}/patches" \
+ epatch
+ fi
+}
+
+src_compile() {
+ emake -C docs/schemas -f "${FILESDIR}/Makefile-trang"
+}
+
+src_test() {
+ # No we don't need tests here... trang will take care of checking
+ # the well-formedness of the schema files for us
+ :
+}
+
+src_install() {
+ insinto ${SITEETC}/${PN}
+ doins "${FILESDIR}/schemas.xml" docs/schemas/*.rnc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/nxml-svg-schemas-1.1.20081123 b/app-emacs/nxml-svg-schemas-1.1.20081123
deleted file mode 100644
index ef5ce0bdd18f..000000000000
--- a/app-emacs/nxml-svg-schemas-1.1.20081123
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-text/trang >=virtual/emacs-23
-DESCRIPTION=Extension for nxml-mode with SVG 1.1 schemas
-EAPI=4
-HOMEPAGE=http://www.w3.org/TR/SVG11/
-KEYWORDS=amd64 ~x86
-LICENSE=HPND
-RDEPEND=>=virtual/emacs-23
-SLOT=1.1
-SRC_URI=http://www.flameeyes.eu/gentoo-distfiles/w3c-svg-rng-1.1.20081123.zip
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=4beb092b9449b517a8894a3ded799f47
diff --git a/app-emacs/nxml-svg-schemas/Manifest b/app-emacs/nxml-svg-schemas/Manifest
new file mode 100644
index 000000000000..d46b59b5c38b
--- /dev/null
+++ b/app-emacs/nxml-svg-schemas/Manifest
@@ -0,0 +1,6 @@
+AUX 60nxml-svg-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
+AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf204c43bbea5db01626847af7ab96854efcbcc34e7fe9b1c32873ad22ef13873a1a06790e9580371d SHA512 3544959cc57ce1b273e4b9de95f51e1e21d23cc35fb48e02f179a055a61ee9092efdc43405f72c3aacb3c74eada7fabf5952eb49e3ff0514fd69a3092268dc4f
+AUX schemas.xml 495 BLAKE2B ecb678b98a23e0631da09f9befa73b2b41c5204f78423f9957eaabd6963c5e8b63114c0f908039618744e4aa4643603b58a9ded5fdbf157e0cc60b1810afce84 SHA512 d6a9f0b9db51e05b4f3d0395c8d43a0577d23fdb6c0e9d0123682f00d4ccac5897dfdbd157560b3bb9f06a8a768298489e8b8a2843d7e7a65ffb4a5e20c1b316
+DIST w3c-svg-rng-1.1.20081123.zip 48420 BLAKE2B a89da9708ea79085ad5aef1f85769683af2a5c8ab84a5a4f53b9c2fdeebf422a96065309d69eb4ac9bd069bcd3685ee849c7cdb4b9b9e7829ff58fb0b7b8b754 SHA512 69e44a7c04a3af77d0fed8f19372cfcad7998e262a44b520145fe2c0ad03bf20daf57e1e97f71ff27f0e06bd3f07d1ec0b0976fdd893d77df2f82709f7c1ce1f
+EBUILD nxml-svg-schemas-1.1.20081123.ebuild 1161 BLAKE2B 3091c7f6fd45b238fe2fae9fc88bb2458b7b883748d2ea50d11d2930c127db57bad275c9b2e9d3e3230a85cfa88b0da14d2062a079f8dd7aaf13db7a7abd2b2c SHA512 c889a3c55acbbdc5909f1c960404bc431d0902f1bb515459547debbb5af7ef26262b8f46844eba63831ed72c2a1795bdb9d40b6917d7ef917a658915566594fa
+MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/nxml-svg-schemas/files/60nxml-svg-schemas-gentoo.el b/app-emacs/nxml-svg-schemas/files/60nxml-svg-schemas-gentoo.el
new file mode 100644
index 000000000000..c574746e6576
--- /dev/null
+++ b/app-emacs/nxml-svg-schemas/files/60nxml-svg-schemas-gentoo.el
@@ -0,0 +1,5 @@
+;; This must be executed after rng-schema-locating-files
+;; is set in rng-loc (which is part of nxml-mode).
+(eval-after-load "rng-loc"
+ '(add-to-list 'rng-schema-locating-files
+ "@SITEETC@/schemas.xml"))
diff --git a/app-emacs/nxml-svg-schemas/files/Makefile-trang b/app-emacs/nxml-svg-schemas/files/Makefile-trang
new file mode 100644
index 000000000000..699cf676ff45
--- /dev/null
+++ b/app-emacs/nxml-svg-schemas/files/Makefile-trang
@@ -0,0 +1,6 @@
+# -*- makefile -*-
+
+all: $(patsubst %.rng,%.rnc,$(wildcard *.rng))
+
+%.rnc: %.rng
+ trang -I rng -O rnc $< $@
diff --git a/app-emacs/nxml-svg-schemas/files/schemas.xml b/app-emacs/nxml-svg-schemas/files/schemas.xml
new file mode 100644
index 000000000000..baebe4af596c
--- /dev/null
+++ b/app-emacs/nxml-svg-schemas/files/schemas.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
+ <!-- This version of the locatingRules does not support having
+ enough details to distinguish between different SVG versions,
+ maybe in the future it will.
+ -->
+
+ <uri pattern="*.svg" typeId="SVG" />
+ <namespace ns="http://www.w3.org/2000/svg" typeId="SVG" />
+ <documentElement localName="svg" typeId="SVG" />
+
+ <typeId id="SVG" uri="svg11.rnc" />
+</locatingRules>
diff --git a/app-emacs/nxml-svg-schemas/metadata.xml b/app-emacs/nxml-svg-schemas/metadata.xml
new file mode 100644
index 000000000000..c438baf3b326
--- /dev/null
+++ b/app-emacs/nxml-svg-schemas/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 type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild b/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild
new file mode 100644
index 000000000000..639661441bd5
--- /dev/null
+++ b/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Extension for nxml-mode with SVG 1.1 schemas"
+HOMEPAGE="http://www.w3.org/TR/SVG11/"
+# original SRC_URI is http://www.w3.org/Graphics/SVG/1.1/rng/rng.zip
+# but since it's unversioned, I versioned it and got it locally.
+SRC_URI="http://www.flameeyes.eu/gentoo-distfiles/w3c-svg-rng-${PV}.zip"
+
+LICENSE="HPND"
+# In a future we might have 1.2 schemas too, but for now we can only
+# install this one anyway because the schemas.xml syntax is not
+# sophisticated enough.
+SLOT="1.1"
+KEYWORDS="amd64 ~x86"
+
+# Yes this requires Java, but I'd rather not repackage this, if you
+# know something better in C, I'll be glad to use that.
+DEPEND="app-text/trang"
+RDEPEND=""
+
+S="${WORKDIR}"
+SITEFILE="60${PN}-gentoo.el"
+
+src_prepare() {
+ # we don't need the doctype for our work
+ sed -i -e '/DOCTYPE grammar/d' *.rng || die "sed failed"
+}
+
+src_compile() {
+ emake -f "${FILESDIR}/Makefile-trang"
+}
+
+src_install() {
+ insinto "${SITEETC}/${PN}"
+ doins "${FILESDIR}/schemas.xml" *.rnc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/ocaml-mode-3.12.1 b/app-emacs/ocaml-mode-3.12.1
deleted file mode 100644
index e0b5fc66b43e..000000000000
--- a/app-emacs/ocaml-mode-3.12.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs mode for OCaml
-EAPI=4
-HOMEPAGE=http://www.ocaml.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://caml.inria.fr/distrib/ocaml-3.12/ocaml-3.12.1.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=c9d57ce29db7be196ab7606b037fa77c
diff --git a/app-emacs/ocaml-mode-3.12.1-r1 b/app-emacs/ocaml-mode-3.12.1-r1
deleted file mode 100644
index 40a2bdffa904..000000000000
--- a/app-emacs/ocaml-mode-3.12.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs mode for OCaml
-EAPI=5
-HOMEPAGE=http://www.ocaml.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://caml.inria.fr/distrib/ocaml-3.12/ocaml-3.12.1.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=5319ba0b45260f84dd7125c1ccd6400c
diff --git a/app-emacs/ocaml-mode-4.00.1 b/app-emacs/ocaml-mode-4.00.1
deleted file mode 100644
index 593faf3c32bc..000000000000
--- a/app-emacs/ocaml-mode-4.00.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs mode for OCaml
-EAPI=5
-HOMEPAGE=http://www.ocaml.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://caml.inria.fr/distrib/ocaml-4.00/ocaml-4.00.1.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=4109d3fec5dbde4d8c3ba4afd0600068
diff --git a/app-emacs/ocaml-mode/Manifest b/app-emacs/ocaml-mode/Manifest
new file mode 100644
index 000000000000..7fcfc4742ba2
--- /dev/null
+++ b/app-emacs/ocaml-mode/Manifest
@@ -0,0 +1,8 @@
+AUX 50ocaml-mode-gentoo-3.12.1.el 499 BLAKE2B 30d49a4e43fbf4fac02f4a2dd8a9fe7c3aeea623836330e3ed0f8921cc96a02d087f35a32a93f6e404392a1f915539799d1a5c8168b06cb1d8ab76ea0ac6b8fa SHA512 0be69a30c07caeff818e4d6fb0147e18855e88a3bb6a6e876b170edddb32382c0bd19ca960836d8442eecd00e78be09cba7de08030420645c2ef1ba5d9198524
+AUX 50ocaml-mode-gentoo.el 501 BLAKE2B 68182139142156463bc5ee18db988deb8ca61e512970ba317c34cf76422f47ccf2f1b8837d954139a82c07f84546ea39ecbe14db9ba589ef2dd614a42df483fc SHA512 a8e665564f8b8394c677d7495ba1aac1e3f6cf1f3cd52c8ae1fdb37028fdaac8b021eeb17ce7c2e2e40dda0294888abf0e1078f821367c8a05715b5326dc73ec
+DIST ocaml-3.12.1.tar.bz2 2949124 BLAKE2B 8814927411cb9b604c78f44d172fd1f8b3d5f6009a1e722d442b8e49709778824cd6d1341e8129454d49000ea4d1234c533ee72cf0fa8fa84ee3b4d664177c4a SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7
+DIST ocaml-4.00.1.tar.bz2 2762205 BLAKE2B f9a788eef67158b036ee551360410921beab87f1b01684ca17d5cb87a30cc0cd475ca640fcb284ad88d9054927ae0fd397921574cc9098956d60e80915d4cbb4 SHA512 77899430706394af558666361b152d47df3a3e21831059875f8b317d0ff9d1a010177bf1e5851e522e086c20768e92c71344aa53eda0ce003f278752870ab5da
+EBUILD ocaml-mode-3.12.1-r1.ebuild 478 BLAKE2B 57435b46af18eb982cb38ed4fb156635c19edcd9f48c26498704c9a4b2fea05e0c61ebd4d84d94ce9e8b1977ea0753df56baa675a660ddc367d0008f241a6975 SHA512 7f455663560d3ed3b52564192e353f1dda06afbd4ffc99f99332c179ed62f602fa66ff0b07daf4ebdc248e44dba35867e7b10f78630efcdd4d02f1854934107a
+EBUILD ocaml-mode-3.12.1.ebuild 481 BLAKE2B b55dd0c58c9f1f6615032c95066fb7bdbf425067f9a71b1dcb6e353eed96d60a332820725041a1c5a0ac2b96335938c590c8e7f828ea990150d6c2e33ad1f0d2 SHA512 d31b7980be6f5240927a313ae43729a06a0b5a31470a41192c00dbeeb43e3190c33097832dc580fa62fe33c3aeef0603c07afe184945a069dc145a5137d0149b
+EBUILD ocaml-mode-4.00.1.ebuild 516 BLAKE2B 2596a6e9ec52b4b5a524b3a7a1bea907ffea82ed24ab9faa00523782b3408ff372fc18d975fadbd2f8f221cdd2ead5d14970ddec8084a52ab7292db853bb14e7 SHA512 2097d70cbb13f553a4afa9dc354b669b5fc65eb7ba09ea8f91fff2f3eb7068c5b35cba5108f76cd0878387f909a18ffeb2be993409d6aec7f4a41fa50f2d2ec8
+MISC metadata.xml 388 BLAKE2B 3b0d21b61541c15e807ececd8bfeb3a91ceefd5075836b4a22a990b1f0c9b4ad71ce68b9d65935382e5f84ae6fc49d022fc2b1c0704a5cf331857b33e09bd327 SHA512 d997ec7cfd421fa931b5ef0cc7713a75cffd1c1fb0204364253fa5243b67ae60389723f9ea473e7558bc87fcb6df54b85c987ca269c15ddc4613157ccee6b9db
diff --git a/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo-3.12.1.el b/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo-3.12.1.el
new file mode 100644
index 000000000000..bea123308024
--- /dev/null
+++ b/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo-3.12.1.el
@@ -0,0 +1,10 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'auto-mode-alist '("\\.ml[iylp]?\\'" . caml-mode))
+(autoload 'caml-mode "caml" "Major mode for editing Caml code." t)
+(autoload 'run-caml "inf-caml" "Run an inferior Caml process." t)
+(autoload 'camldebug "camldebug"
+ "Run camldebug on program FILE in buffer *camldebug-FILE*." t)
+(autoload 'inferior-caml-set-font-lock "caml-font")
+
+(eval-after-load "caml" '(require 'caml-font))
+(add-hook 'inferior-caml-mode-hooks 'inferior-caml-set-font-lock)
diff --git a/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el b/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el
new file mode 100644
index 000000000000..8f45033a3fce
--- /dev/null
+++ b/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el
@@ -0,0 +1,10 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'auto-mode-alist '("\\.ml[iylp]?\\'" . caml-mode))
+(autoload 'caml-mode "caml" "Major mode for editing Caml code." t)
+(autoload 'run-caml "inf-caml" "Run an inferior Caml process." t)
+(autoload 'camldebug "camldebug"
+ "Run camldebug on program FILE in buffer *camldebug-FILE*." t)
+(autoload 'inferior-caml-mode-font-hook "caml-font")
+
+(eval-after-load "caml" '(require 'caml-font))
+(add-hook 'inferior-caml-mode-hooks 'inferior-caml-mode-font-hook)
diff --git a/app-emacs/ocaml-mode/metadata.xml b/app-emacs/ocaml-mode/metadata.xml
new file mode 100644
index 000000000000..81601b351288
--- /dev/null
+++ b/app-emacs/ocaml-mode/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
new file mode 100644
index 000000000000..9b0b1a174d53
--- /dev/null
+++ b/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+MY_P=${P/-mode/}
+DESCRIPTION="Emacs mode for OCaml"
+HOMEPAGE="http://www.ocaml.org/"
+SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+
+S="${WORKDIR}/${MY_P}/emacs"
+SITEFILE="50${PN}-gentoo-${PV}.el"
+DOCS="README README.itz"
diff --git a/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild
new file mode 100644
index 000000000000..095b08c559eb
--- /dev/null
+++ b/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+MY_P=${P/-mode/}
+
+DESCRIPTION="Emacs mode for OCaml"
+HOMEPAGE="http://www.ocaml.org/"
+SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}/emacs"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README README.itz"
diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
new file mode 100644
index 000000000000..a0976cb97e74
--- /dev/null
+++ b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+MY_P=${P/-mode/}
+DESCRIPTION="Emacs mode for OCaml"
+HOMEPAGE="http://www.ocaml.org/"
+SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${MY_P}/emacs"
+SITEFILE="50${PN}-gentoo-3.12.1.el"
+DOCS="README README.itz"
diff --git a/app-emacs/org-mode-8.3.2-r1 b/app-emacs/org-mode-8.3.2-r1
deleted file mode 100644
index ffb08c0a4116..000000000000
--- a/app-emacs/org-mode-8.3.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=doc? ( virtual/texi2dvi ) >=virtual/emacs-23
-DESCRIPTION=An Emacs mode for notes and project planning
-EAPI=5
-HOMEPAGE=https://www.orgmode.org/
-IUSE=contrib doc odt-schema
-KEYWORDS=amd64 ppc x86 ~x86-fbsd ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )
-RDEPEND=>=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=http://orgmode.org/org-8.3.2.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=9fb4c436babce6a6ed8400299d8a9dda
diff --git a/app-emacs/org-mode-9.0.4 b/app-emacs/org-mode-9.0.4
deleted file mode 100644
index 87d494a914b1..000000000000
--- a/app-emacs/org-mode-9.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=doc? ( virtual/texi2dvi ) >=virtual/emacs-24
-DESCRIPTION=An Emacs mode for notes and project planning
-EAPI=6
-HOMEPAGE=https://www.orgmode.org/
-IUSE=contrib doc odt-schema
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )
-RDEPEND=>=virtual/emacs-24
-RESTRICT=test
-SLOT=0
-SRC_URI=http://orgmode.org/org-9.0.4.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=333be05cf5593ba73f84af361938e32f
diff --git a/app-emacs/org-mode-9.1.13 b/app-emacs/org-mode-9.1.13
deleted file mode 100644
index 076380e89344..000000000000
--- a/app-emacs/org-mode-9.1.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=doc? ( virtual/texi2dvi ) >=virtual/emacs-24
-DESCRIPTION=An Emacs mode for notes and project planning
-EAPI=6
-HOMEPAGE=https://www.orgmode.org/
-IUSE=contrib doc odt-schema
-KEYWORDS=amd64 ppc x86 ~x86-fbsd ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )
-RDEPEND=>=virtual/emacs-24
-RESTRICT=test
-SLOT=0
-SRC_URI=http://orgmode.org/org-9.1.13.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=5b7397f1b2c2970d4861a32b8a8d683f
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
new file mode 100644
index 000000000000..27be46526d57
--- /dev/null
+++ b/app-emacs/org-mode/Manifest
@@ -0,0 +1,8 @@
+AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
+DIST org-8.3.2.tar.gz 4442361 BLAKE2B f21f07578e870cd3edaa3721a53f679627c0115c320c666c2086e201e272c0ef03540bfdd90936a624cd4c4dcbac21b91346ba975b6006ada2d46184f73574f3 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2
+DIST org-9.0.4.tar.gz 4431853 BLAKE2B 1ecb8fa08597e08a6143cdf5d262274472eb5b245fa1103fe6b5509a5bb0d0aa471e9414b8f6293c3d5720c7b307a77e0f03ad6a9b590bf2469da5d54ddedfaf SHA512 fc3ab3e7c2b5f3243937497ea9515ea81434f2274ac158da7d0418e8ddc33debae2f1887ffbe37e3768d32a028834cc0ef35f3c3cc3938d7b24e0c5bfcf65ae0
+DIST org-9.1.13.tar.gz 4625532 BLAKE2B c7044913b8fd0bde43fa1ff0f4bc9963ebce1cda17753fe7642aff914603a4278e7396acf2236c27334f2b9a009bd9e3310ec6144d851e121c3f6ec6516ad6c7 SHA512 a1cb1b2a8db082b7f7a03e90109352bad219808cb506af30082b87fc2c6d66733ce304df4379542e7a85e20c213e1cbc8bf4c9d6c9777fea393a88755129c4bf
+EBUILD org-mode-8.3.2-r1.ebuild 1777 BLAKE2B f05cf006f13a39b5cdc62da3e5ba742c88b2cbdc64787218e0f2862095637714e2319c406327ce69649ac163e2e9f8cf06031d8e9464337b051ebb71da56f67f SHA512 2e5c6790fc10a7df5859ff7893ad6b37417099152e8021b306f536fcd92f7c4b2b3ca2477f268ff166b7eea92cd0c1b76ff0c3db3da4003c6181e6480959e126
+EBUILD org-mode-9.0.4.ebuild 1778 BLAKE2B b5a6c58c509c1531f9327bf7551c76eb49612061635eddb7d71a50371edb2f7e09e637d76ef30c5c7f4f63e1a24c9b9d45ad0421f43b5bf4513e8eff71c75c1a SHA512 6ebb922aec745216d6b10b4e025ffc30ecd6cb8c937396ddce75a0589b1b2ab0a953c1e10fb623a3b078822d3b2db6a10283078d8db48a83a2dfffc288b64065
+EBUILD org-mode-9.1.13.ebuild 1750 BLAKE2B f2e0c7a8921ca7583cd9417294cc3c692097694777cb6f0024361748dc88ff95bee545a1746073df475451b082f6795aec84633b14235714a60e8fe3fd6db8e4 SHA512 350915aedb567f6752dfef8debb8ac5d3c34a6a582341925ce03f52d7909c07a6bd86ee53ad579b3479442448136ee85f45b5976ff8f32c5d36d7cc40f27a1b7
+MISC metadata.xml 1368 BLAKE2B 2680c11ca69b9acd8b96b6dc76586037bd1b7ce0e9cdc183781742f373ce8d0be5b8820b7fa4d18c4f59523e10d3b40df3edbba5178169fb993bacc8d10cdfe1 SHA512 6c557a3a3ecb9b1993bd8c976d0a81460cd1ecc6e53fbaeb0d086e8d78497485a1b34470b72a73e779878b4947a22d61ef36259037cf6ff0315a823e15e09c66
diff --git a/app-emacs/org-mode/files/50org-mode-gentoo.el b/app-emacs/org-mode/files/50org-mode-gentoo.el
new file mode 100644
index 000000000000..431f52ce467a
--- /dev/null
+++ b/app-emacs/org-mode/files/50org-mode-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
diff --git a/app-emacs/org-mode/metadata.xml b/app-emacs/org-mode/metadata.xml
new file mode 100644
index 000000000000..1947e1fe4286
--- /dev/null
+++ b/app-emacs/org-mode/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ Org-mode is a mode for keeping notes, maintaining ToDo lists, and doing
+ project planning with a fast and effective plain-text system.
+
+ Org-mode develops organizational tasks around NOTES files that contain
+ information about projects as plain text. Org-mode is implemented on top of
+ outline-mode, which makes it possible to keep the content of large files
+ well structured. Visibility cycling and structure editing help to work with
+ the tree. Tables are easily created with a built-in table editor. Org-mode
+ supports ToDo items, deadlines, time stamps, and scheduling. It dynamically
+ compiles entries into an agenda. Plain text URL-like links connect to
+ websites, emails, Usenet messages, BBDB entries, and any files related to
+ the projects. For printing and sharing of notes, an Org-mode file can be
+ exported as a structured ASCII file, HTML, and LaTeX.
+</longdescription>
+<stabilize-allarches/>
+<use>
+ <flag name="contrib">Install user-contributed files</flag>
+ <flag name="odt-schema">Install non-free schema files
+ for OpenDocument Text exporter</flag>
+</use>
+</pkgmetadata>
diff --git a/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
new file mode 100644
index 000000000000..54ca7f39f1a8
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="https://www.orgmode.org/"
+SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-macos"
+IUSE="contrib doc odt-schema"
+RESTRICT="test"
+
+DEPEND="doc? ( virtual/texi2dvi )"
+
+S="${WORKDIR}/org-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ emake datadir="${EPREFIX}${SITEETC}/${PN}"
+ use doc && emake pdf card
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ ETCDIRS="styles $(use odt-schema && echo schema)" \
+ lispdir="${EPREFIX}${SITELISP}/${PN}" \
+ datadir="${EPREFIX}${SITEETC}/${PN}" \
+ infodir="${EPREFIX}/usr/share/info" \
+ install
+
+ cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
+
+ if use contrib; then
+ elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
+ insinto /usr/share/doc/${PF}/contrib
+ doins -r contrib/README contrib/scripts
+ find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
+ -exec rm -f '{}' '+'
+ # add the contrib subdirectory to load-path
+ sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
+ "${T}/${SITEFILE}" || die
+ fi
+
+ elisp-site-file-install "${T}/${SITEFILE}"
+ dodoc README doc/library-of-babel.org doc/orgcard.txt etc/ORG-NEWS
+ use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+ DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
+ so you may have to install one or more additional packages.
+ A non-exhaustive list of these dependencies may be found at
+ <http://orgmode.org/worg/org-dependencies.html>."
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/org-mode/org-mode-9.0.4.ebuild b/app-emacs/org-mode/org-mode-9.0.4.ebuild
new file mode 100644
index 000000000000..4ff2e904df26
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.0.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="https://www.orgmode.org/"
+SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
+IUSE="contrib doc odt-schema"
+RESTRICT="test"
+
+DEPEND="doc? ( virtual/texi2dvi )"
+
+S="${WORKDIR}/org-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ emake datadir="${EPREFIX}${SITEETC}/${PN}"
+ use doc && emake pdf card
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ ETCDIRS="styles $(use odt-schema && echo schema)" \
+ lispdir="${EPREFIX}${SITELISP}/${PN}" \
+ datadir="${EPREFIX}${SITEETC}/${PN}" \
+ infodir="${EPREFIX}/usr/share/info" \
+ install
+
+ cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
+
+ if use contrib; then
+ elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
+ insinto /usr/share/doc/${PF}/contrib
+ doins -r contrib/README contrib/scripts
+ find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
+ -exec rm -f '{}' '+'
+ # add the contrib subdirectory to load-path
+ sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
+ "${T}/${SITEFILE}" || die
+ fi
+
+ elisp-site-file-install "${T}/${SITEFILE}"
+ dodoc README doc/library-of-babel.org etc/ORG-NEWS
+ use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+ DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
+ so you may have to install one or more additional packages.
+ A non-exhaustive list of these dependencies may be found at
+ <http://orgmode.org/worg/org-dependencies.html>."
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/org-mode/org-mode-9.1.13.ebuild b/app-emacs/org-mode/org-mode-9.1.13.ebuild
new file mode 100644
index 000000000000..f4c866b2b0d5
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.1.13.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="https://www.orgmode.org/"
+SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-macos"
+IUSE="contrib doc odt-schema"
+RESTRICT="test"
+
+DEPEND="doc? ( virtual/texi2dvi )"
+
+S="${WORKDIR}/org-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ emake datadir="${EPREFIX}${SITEETC}/${PN}"
+ use doc && emake pdf card
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ ETCDIRS="styles $(use odt-schema && echo schema)" \
+ lispdir="${EPREFIX}${SITELISP}/${PN}" \
+ datadir="${EPREFIX}${SITEETC}/${PN}" \
+ infodir="${EPREFIX}/usr/share/info" \
+ install
+
+ cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
+
+ if use contrib; then
+ elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
+ insinto /usr/share/doc/${PF}/contrib
+ doins -r contrib/README contrib/scripts
+ find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
+ -exec rm -f '{}' '+'
+ # add the contrib subdirectory to load-path
+ sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
+ "${T}/${SITEFILE}" || die
+ fi
+
+ elisp-site-file-install "${T}/${SITEFILE}"
+ dodoc README etc/ORG-NEWS
+ use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+ DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
+ so you may have to install one or more additional packages.
+ A non-exhaustive list of these dependencies may be found at
+ <http://orgmode.org/worg/org-dependencies.html>."
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/outline-magic-0.9 b/app-emacs/outline-magic-0.9
deleted file mode 100644
index fe4deb0cf5ea..000000000000
--- a/app-emacs/outline-magic-0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Outline mode extensions for Emacs
-EAPI=5
-HOMEPAGE=https://github.com/tj64/outline-magic https://www.emacswiki.org/emacs/OutlineMagic
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/outline-magic-0.9.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=aac2f3da7eb68b1e579c68132b4e8e3d
diff --git a/app-emacs/outline-magic/Manifest b/app-emacs/outline-magic/Manifest
new file mode 100644
index 000000000000..018984995db7
--- /dev/null
+++ b/app-emacs/outline-magic/Manifest
@@ -0,0 +1,4 @@
+AUX 50outline-magic-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST outline-magic-0.9.el.bz2 6823 BLAKE2B bcdada425fb8a1e7121d8592dcbf078a95ec7c9fe67cdb4f982e7e58cf16e969de62a6a025dcde2aad23164d23e131c73dc4a0abcd40b87d406f7b236cc23a09 SHA512 46c404954642cb88da4bfe82432e4d45b9c05671d81333dd6bfd422a5311c1fd76daf1893be3875044e68ce43bb8b70928017a420715a7e08da76d366d969a49
+EBUILD outline-magic-0.9.ebuild 390 BLAKE2B 6097068fdd6406a418fcfe0f26322f5eb3dc8de5f814405d0d14fef5e9f4105bb18956a83b7a4121ff7d202700b783add279d177002e72910ab15561fdeaca25 SHA512 c34edbcfe1d768d5177bee111907a8c22eb87dcd861dfa3ca19405cfb091f54d33ee0adddf24a3fc59d291f6d196e616327f53568b1f2c88ea98e4db560ead93
+MISC metadata.xml 363 BLAKE2B 1f4fb73e8c1f7350118db35ba541341e489c999981ba3775710280a7fc5917364660805693e2b8e92035337c464ce9399d4265d6235ef4c7cc92fd0c20677df5 SHA512 d897a562be9b996b76598748c74001dc6f2ca6612345e80dfb1cb2df02002759ede8251a17c4ae329bc7c229ab0e98a81aee520c44e5c7a00e638c0038351344
diff --git a/app-emacs/outline-magic/files/50outline-magic-gentoo.el b/app-emacs/outline-magic/files/50outline-magic-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/outline-magic/files/50outline-magic-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/outline-magic/metadata.xml b/app-emacs/outline-magic/metadata.xml
new file mode 100644
index 000000000000..a81222f476c8
--- /dev/null
+++ b/app-emacs/outline-magic/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">tj64/outline-magic</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/outline-magic/outline-magic-0.9.ebuild b/app-emacs/outline-magic/outline-magic-0.9.ebuild
new file mode 100644
index 000000000000..27f65c51fc44
--- /dev/null
+++ b/app-emacs/outline-magic/outline-magic-0.9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Outline mode extensions for Emacs"
+HOMEPAGE="https://github.com/tj64/outline-magic
+ https://www.emacswiki.org/emacs/OutlineMagic"
+SRC_URI="mirror://gentoo/${P}.el.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/paredit-23-r1 b/app-emacs/paredit-23-r1
deleted file mode 100644
index d915e6e8914a..000000000000
--- a/app-emacs/paredit-23-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Minor mode for performing structured editing of S-expressions
-EAPI=5
-HOMEPAGE=https://mumble.net/~campbell/emacs/ https://www.emacswiki.org/emacs/ParEdit
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/paredit-23.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=cc59a57ffcb8673f6fcbedc308687d55
diff --git a/app-emacs/paredit/Manifest b/app-emacs/paredit/Manifest
new file mode 100644
index 000000000000..16df182fd81f
--- /dev/null
+++ b/app-emacs/paredit/Manifest
@@ -0,0 +1,4 @@
+AUX 50paredit-gentoo.el 503 BLAKE2B f08ba9965af5d555de5539b017eb230c9e5eb296f0ea9f98fb2f46a4a7c665e5757cc7b135df7282118f16e6b96a926e8e8952b926917a7cb5e0266d4d751a93 SHA512 4635fa54babe7df170356f4d74d9419bfbe185301a37110d5a12620b1c6ab4654b66c2062814cacf64e480c5079e3da82354ff78db6e600e4dac68e0ba13451c
+DIST paredit-23.tar.xz 24204 BLAKE2B 1bb1f9466a4c418800ca66a6e0ac76f8d2324d27e27a6f2ac1aa0be576dc8fede6392bde919ed489b14f4ddd3e26fab102e722803d3e9dc5874c5321bd269d35 SHA512 33ae10d95d3b2d8fe2466fba20d6aa0abac56684807fb381ab0db2798e99e2358c6dca71794b95768b53be661b9181f458e932bb37c31ba7ebba155a57f1bb01
+EBUILD paredit-23-r1.ebuild 535 BLAKE2B e962729e43e16116eebdb5b76cccd0600f901b5d29cf169bfa03212d60d453dc48cc4a758e1ec0ef34e20c7b22d3d49e85b3e477b8fd622406faf2d5a2a473a6 SHA512 d8cfd451a27104afca26c97cf0a0a849d5a5495848b3a54c3348c122cb8ab545daca0b52885d31680a72fe294e3982323c4be4339df620ab3485d11434379fb6
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/paredit/files/50paredit-gentoo.el b/app-emacs/paredit/files/50paredit-gentoo.el
new file mode 100644
index 000000000000..a23e03ae81fa
--- /dev/null
+++ b/app-emacs/paredit/files/50paredit-gentoo.el
@@ -0,0 +1,10 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'paredit-mode "paredit"
+ "Minor mode for pseudo-structurally editing Lisp code." t)
+(let ((turn-on-paredit-mode (lambda () (paredit-mode 1))))
+ ;; some hooks: lisp-mode-hook and scheme-mode-hook are recommended
+ ;; in the paredit source code
+ (add-hook 'lisp-mode-hook turn-on-paredit-mode)
+ (add-hook 'scheme-mode-hook turn-on-paredit-mode)
+ (add-hook 'emacs-lisp-mode-hook turn-on-paredit-mode)
+ (add-hook 'slime-mode-hook turn-on-paredit-mode))
diff --git a/app-emacs/paredit/metadata.xml b/app-emacs/paredit/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/paredit/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/paredit/paredit-23-r1.ebuild b/app-emacs/paredit/paredit-23-r1.ebuild
new file mode 100644
index 000000000000..274c44114d7b
--- /dev/null
+++ b/app-emacs/paredit/paredit-23-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Minor mode for performing structured editing of S-expressions"
+HOMEPAGE="https://mumble.net/~campbell/emacs/
+ https://www.emacswiki.org/emacs/ParEdit"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+ elisp_src_install
+ dohtml *.html
+}
diff --git a/app-emacs/pariemacs-3.14 b/app-emacs/pariemacs-3.14
deleted file mode 100644
index 21b10211397a..000000000000
--- a/app-emacs/pariemacs-3.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sci-mathematics/pari >=virtual/emacs-23
-DESCRIPTION=sci-mathematics/pari emacs mode
-EAPI=6
-HOMEPAGE=http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sci-mathematics/pari >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/latest-pari-distrib/pariemacs-3.14.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=8ee143a7579375bbf2417a32b2dce359
diff --git a/app-emacs/pariemacs/Manifest b/app-emacs/pariemacs/Manifest
new file mode 100644
index 000000000000..f408e01feed8
--- /dev/null
+++ b/app-emacs/pariemacs/Manifest
@@ -0,0 +1,5 @@
+AUX 64pariemacs-gentoo.el 224 BLAKE2B 8ae37110131dc88c43273313d52e6036c71712b77a08d66bbd4316dd363cd23a3892f35693ab2f446d5600ab480fec6bd567c5280c7632f69f70103d0ff24116 SHA512 3d3304a3b44a686186e1054af3fa55d7881742f62000d968a4651da1cfddb53650b3b690ee0430b684493578fb11d73531ad07a5a8681516d837788262cc9477
+AUX pariemacs-3.14-makefile.patch 1487 BLAKE2B a7fa6fa8aea98627a6e9f509376fe0a11e1e8b5db8c5bb6b486c053d6f716500f2ccb189c1cc0cbe49ac68b74d49fb6313a178d7178070365bc19d2ac4ebf96b SHA512 87a3c229561498f7f7256a2b3dfe2abecd6e962d53379cc38fc6a4fe7a86940ba0c4e8ba51c7520480c218c18f48cde90dfdfe7b371db53f1c8c36e2a6a0f0a1
+DIST pariemacs-3.14.tar.gz 114347 BLAKE2B 40e7b11d3fd674a2525c145be97f3b9119379e7a2a1c689b1e76107bccc0d48b08d7e8e2f1785bd315723e99961e06409e102946fceaf52099f4bc7cf6ef9ed1 SHA512 97ef66c497594c288e7f3e3c77d8d5ec31acf6cdcf86443e0754c69074adf51b07620c858dd5a71d3dbb2a58b05f6774e348c2079e9cc888a909988c4470c79c
+EBUILD pariemacs-3.14.ebuild 872 BLAKE2B 597294183d298d68c9bf12936a1cfbe1e1720048b23b875410960ef39498ffe6d242d4daaf5533b283a7ebb4310cd8b48ac84845d4d6131c319049f3660254cf SHA512 a26b1b58d4442a424d98108e5d47be739888691e7d8bc09634fe8ad50920b822a57bb5c4815e07b7d8b71cf8752628edf2cd6027bcb8e4a77580ea49fc72d544
+MISC metadata.xml 385 BLAKE2B 571589c01efc6d5a066ed50fbe40d5136a13184c4fc755457e73d75fa0cf76a580a42488da78363d476c4c089f69d34b9ff3cf99d407157b3993b6d7caa22a11 SHA512 60a84b02c2a242f238ce0a1fba4be9a1b2e7ece99c09d13e647835aece76ae8ddb93617fd43c390e5185c486bcdf62afb3169d64693f94c947954d57a4de6270
diff --git a/app-emacs/pariemacs/files/64pariemacs-gentoo.el b/app-emacs/pariemacs/files/64pariemacs-gentoo.el
new file mode 100644
index 000000000000..2dc1967ac762
--- /dev/null
+++ b/app-emacs/pariemacs/files/64pariemacs-gentoo.el
@@ -0,0 +1,7 @@
+;; site-init for pariemacs
+
+(add-to-list 'load-path "/usr/share/emacs/site-lisp/pariemacs")
+(autoload 'gp-mode "pari" nil t)
+(autoload 'gp-script-mode "pari" nil t)
+(autoload 'gp "pari" nil t)
+(autoload 'gpman "pari" nil t)
diff --git a/app-emacs/pariemacs/files/pariemacs-3.14-makefile.patch b/app-emacs/pariemacs/files/pariemacs-3.14-makefile.patch
new file mode 100644
index 000000000000..bbcd8b77c585
--- /dev/null
+++ b/app-emacs/pariemacs/files/pariemacs-3.14-makefile.patch
@@ -0,0 +1,51 @@
+diff -r -U2 pariemacs.orig/Makefile pariemacs/Makefile
+--- pariemacs.orig/Makefile 2017-12-05 18:54:54.000000000 +0700
++++ pariemacs/Makefile 2018-01-13 19:15:31.095946659 +0700
+@@ -5,19 +5,8 @@
+
+ # Path to pari.cfg file.
+-# Several possibilites:
+-PARI_CFG=/usr/local/lib/pari/pari.cfg
+-# For Debian (package "libpari-dev") install:
+-#PARI_CFG=/usr/lib/pari/pari.cfg
+-# For some other install, the architecture is mentioned
+-# (see https://wiki.ubuntu.com/MultiarchSpec):
+-#PARI_CFG=/usr/lib/i386-linux-gnu/pari/pari.cfg
+-#PARI_CFG=/usr/lib/x86_64-linux-gnu/pari/pari.cfg
+-
+-# In case, you cannot find it, you can use the following default file
+-# (but edit this file first):
+-#PARI_CFG=./pari.cfg-default
++PARI_CFG=./pari.cfg
+
+ # Where to install ourselves ?
+-INSTALL=/usr/local/share/emacs/site-lisp/pari
++INSTALL=/usr/share/emacs/site-lisp/pari
+
+ # Path to 'emacs' binary
+@@ -34,8 +23,4 @@
+ TARFILE=$(DIR).tar
+
+-install: pari-conf.el elc
+- mkdir -p $(INSTALL)
+- cp *.elc *.el README CHANGES COPYING $(INSTALL)
+-
+ pari-conf.el:
+ @if test ! -f $(PARI_CFG); then \
+@@ -52,16 +37,4 @@
+ -f batch-byte-compile *.el
+
+-distrib:
+- @if test -d $(DIR); then \
+- echo "Remove $(DIR) before building a new release"; exit 1; \
+- fi
+- @tar cf $(TARFILE) $(FILES)
+- @mkdir $(DIR) && mv $(TARFILE) $(DIR)
+- @cd $(DIR) && tar xf $(TARFILE) && rm -f $(TARFILE)
+- @tar cf $(TARFILE) $(DIR)
+- @rm -rf $(DIR)
+- @rm -f $(TARFILE).gz
+- @gzip $(TARFILE)
+-
+ clean:
+ rm -f *.elc pari-conf.el
diff --git a/app-emacs/pariemacs/metadata.xml b/app-emacs/pariemacs/metadata.xml
new file mode 100644
index 000000000000..5946ec67bdb8
--- /dev/null
+++ b/app-emacs/pariemacs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sci-mathematics@gentoo.org</email>
+ <name>Gentoo Mathematics Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Emacs modes to edit gp scripts and to run gp in emacs.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-emacs/pariemacs/pariemacs-3.14.ebuild b/app-emacs/pariemacs/pariemacs-3.14.ebuild
new file mode 100644
index 000000000000..aa608c9b7eaa
--- /dev/null
+++ b/app-emacs/pariemacs/pariemacs-3.14.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="sci-mathematics/pari emacs mode"
+HOMEPAGE="http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SRC_URI="http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/latest-pari-distrib/${P}.tar.gz"
+
+RDEPEND="sci-mathematics/pari"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+SITEFILE="64${PN}-gentoo.el"
+DOCS="README CHANGES"
+
+src_prepare() {
+ eapply "${FILESDIR}"/${P}-makefile.patch
+ eapply_user
+ if [ -f /usr/share/doc/pari-*/pari.cfg ]; then
+ cp /usr/share/doc/pari-*/pari.cfg .
+ elif [ -f /usr/share/doc/pari-*/pari.cfg.bz2 ]; then
+ cp /usr/share/doc/pari-*/pari.cfg.bz2 .
+ bunzip2 pari.cfg.bz2
+ else die "pari.cfg not found"
+ fi
+}
+
+src_compile() {
+ make pari-conf.el
+ make elc
+}
diff --git a/app-emacs/php-mode-1.18.2 b/app-emacs/php-mode-1.18.2
deleted file mode 100644
index 7ea7c7990bf2..000000000000
--- a/app-emacs/php-mode-1.18.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-24
-DESCRIPTION=GNU Emacs major mode for editing PHP code
-EAPI=6
-HOMEPAGE=https://github.com/ejmr/php-mode
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-24
-SLOT=0
-SRC_URI=https://github.com/ejmr/php-mode/archive/v1.18.2.tar.gz -> php-mode-1.18.2.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=c4377dfd2b1489d5f12f39d8a2813f1a
diff --git a/app-emacs/php-mode-1.5.0 b/app-emacs/php-mode-1.5.0
deleted file mode 100644
index c5d717c45f37..000000000000
--- a/app-emacs/php-mode-1.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=GNU Emacs major mode for editing PHP code
-EAPI=5
-HOMEPAGE=http://php-mode.sourceforge.net
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3+ FDL-1.2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://sourceforge/php-mode/php-mode-1.5.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=33c21ad5a4d9e059fa967f343ad71824
diff --git a/app-emacs/php-mode/Manifest b/app-emacs/php-mode/Manifest
new file mode 100644
index 000000000000..81afff018978
--- /dev/null
+++ b/app-emacs/php-mode/Manifest
@@ -0,0 +1,6 @@
+AUX 50php-mode-gentoo.el 286 BLAKE2B 1c823d8244e714811c5f1be402d1cd41e7b81951aafdedd01f36fe93f3cb6150792b5ed09ef5fd859211692f766fb8e931581c5e9cd60401d6eade364696edec SHA512 5f6205a7f3300d02b612a0aba58566dba1ad2a5f090c827c7d2d740af9c425cccb8384b37ac81e05eb81b4e31e649726433105b9862b92913e56752c554eec93
+DIST php-mode-1.18.2.tar.gz 81772 BLAKE2B fc27453c15fbc3da1cba8e61392501ba71da7979cd9b9770e147b562950a7a68ec1be19b28cfde1770e48a9edd86e4f7ddda1f280f0c5dc2b58428758ebaf585 SHA512 39c00216c6a1801ae0be016eadc95bf9574ab285dd6125a343cf4c3a5c3ef5b8e579877513c94843a836b97a969402fa0a3714a8cf2f68f7007d629e86834bc3
+DIST php-mode-1.5.0.tar.gz 42687 BLAKE2B 70ed666e5561bbd879ddd3d56d6cf602b873c2a3c68a2f1bab08bc44648c252ae23519bcefc9a215922a137d69b956ebd74c202d8e567ec21ba4db3c68e44a44 SHA512 e05cf9eeff3d17f6af29b03d08f279e4c04f79a2c018de5ddcf097adbf9e67978eeb9f0f9e67b9406c1f33c494597ab1bfa629bdab131d668de40b81d68e796f
+EBUILD php-mode-1.18.2.ebuild 489 BLAKE2B 8a0bdf5c0bf837f4d52e8cb3619427d22a9a3063cf515001ef8cf45a40af6889dfc6bee915cd22eb92f80dadc35366c1b69801e118f280659354473227ae6b4c SHA512 9db42aaeac1ca750ffa6917f6a5543866d6c04460087dc66a009422e5dd69568f132dc69ee59cd2220b67d9cb8d7b80d234c7727fbe3e0525a0eb446cc21b576
+EBUILD php-mode-1.5.0.ebuild 492 BLAKE2B d19744f28e7163d8eb8d2e4fc7e05540d967b38377946d377b35d10de9e168b3edb39ba35a335194507df3a48c63482513d2b6a09d6dfdb61ce69e0b07ac10e4 SHA512 4d65e4d8d7c382f47743c7fb8470c3f6844cf5a8f4babc314fb823a1f8d069be8e6701f408df9b96b53560dd631e14ef2918de77b8284b77136f917dcb9e4ce1
+MISC metadata.xml 358 BLAKE2B e43dc1a1d876d29121c6745f2e66c3b3585ea5ab0aed824c28bece59078fea9df0f6f438701dfc64fdbf90cb258091d5b96b4dc8fa320161ee241fc17be0a4b9 SHA512 eadc968656b4fe2150fd3d360c32d3fc66d42408c61ea60b3df5be2ba6cd3ed6abec1ba45e37269f5d06721eea30d3dbf95f3a747000e5b5d60e614c56ce3f85
diff --git a/app-emacs/php-mode/files/50php-mode-gentoo.el b/app-emacs/php-mode/files/50php-mode-gentoo.el
new file mode 100644
index 000000000000..50c4ef71afa3
--- /dev/null
+++ b/app-emacs/php-mode/files/50php-mode-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'php-mode "php-mode" "Major mode for editing PHP code." t)
+(add-to-list 'auto-mode-alist '("\\.php[s34]?\\'" . php-mode))
+(add-to-list 'auto-mode-alist '("\\.phtml\\'" . php-mode))
+(add-to-list 'auto-mode-alist '("\\.inc\\'" . php-mode))
diff --git a/app-emacs/php-mode/metadata.xml b/app-emacs/php-mode/metadata.xml
new file mode 100644
index 000000000000..a1e2d5fc86a4
--- /dev/null
+++ b/app-emacs/php-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">php-mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/php-mode/php-mode-1.18.2.ebuild b/app-emacs/php-mode/php-mode-1.18.2.ebuild
new file mode 100644
index 000000000000..8e4b4c1303c7
--- /dev/null
+++ b/app-emacs/php-mode/php-mode-1.18.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="GNU Emacs major mode for editing PHP code"
+HOMEPAGE="https://github.com/ejmr/php-mode"
+SRC_URI="https://github.com/ejmr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md Changelog.md"
diff --git a/app-emacs/php-mode/php-mode-1.5.0.ebuild b/app-emacs/php-mode/php-mode-1.5.0.ebuild
new file mode 100644
index 000000000000..0d9b72f3feef
--- /dev/null
+++ b/app-emacs/php-mode/php-mode-1.5.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="GNU Emacs major mode for editing PHP code"
+HOMEPAGE="http://php-mode.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="${PN}.texi"
+DOCS="ChangeLog"
diff --git a/app-emacs/planner-3.42 b/app-emacs/planner-3.42
deleted file mode 100644
index 18e5c1358d92..000000000000
--- a/app-emacs/planner-3.42
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/muse-3.02.6a app-emacs/bbdb app-emacs/emacs-w3m sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=Maintain a local Wiki using Emacs-friendly markup
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/PlannerMode
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3+
-PDEPEND=app-emacs/remember
-RDEPEND=>=app-emacs/muse-3.02.6a app-emacs/bbdb app-emacs/emacs-w3m >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.gna.org/planner-el/planner-3.42.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=fdbd25d48761fcec7cbe9f27a12f6267
diff --git a/app-emacs/planner/Manifest b/app-emacs/planner/Manifest
new file mode 100644
index 000000000000..130e02fa1c8b
--- /dev/null
+++ b/app-emacs/planner/Manifest
@@ -0,0 +1,4 @@
+AUX 80planner-gentoo.el 203 BLAKE2B ad8a347e66386f3eebea0d605396dcf4e2bebf5ba3e001578019f5f94d3baa68ee6bdd58f39fa990289f16e6e9dcf1368b48ff43ab2bcdad080ac0587feed4ab SHA512 60ac1a86188a07e4d1de7024fab965d2f7772dbb175aa987fa035748944ae28fa99dfca128ed3151c1c02218d19d435708587b64a991ce56b0b0d4a966b2ccfe
+DIST planner-3.42.tar.gz 412086 BLAKE2B a9cc8db317d51b2c885f5bb186f367c4778a9175dfc93d8cdfea38014c4964214c27d023bf99ee452dee0e7322f1f2c397d024ef95fd33254f4a19d2ccd40281 SHA512 6c0674a1b780005c37850f25ec8b20c72b3d34b6f4e8ad463392e887e498807567af41c0c6ef0f4141230e2d3bf8c702acebae869efc37f72b1e984519c23b3e
+EBUILD planner-3.42.ebuild 657 BLAKE2B 7b710a4d49a36328000a4445a3c96477c5ab0a954afa47319ca865a893b118e5ac52acc9b2ed931c2d4b8d9097eddef11def5afd550546839d0fa2949b1499da SHA512 85be47f04dc32917c1c5b1ede83d5cfc935e6e79c996a6a40d1c0c5ce4cd0c4d45feb8354b6393c1c689a98fbb09c8c3fd925c19457509aac0d6e6c1a417fe9f
+MISC metadata.xml 562 BLAKE2B a9dfaedfdacfab2b91477ae763a50e842bfb3b8b3651cde08719773354c6b8b4876a56658ab5124910851602b9da1cfb17854cd6d7db3d40300500eef3a7aa03 SHA512 db5a9ca34d1147720aab9b17e403e04d70cdeaff75d515075b666dc82632acdf311cccfad91add73e19c69f6c9047f8c1efe8a155bbca5fd6261159172db515d
diff --git a/app-emacs/planner/files/80planner-gentoo.el b/app-emacs/planner/files/80planner-gentoo.el
new file mode 100644
index 000000000000..b7583c2298dc
--- /dev/null
+++ b/app-emacs/planner/files/80planner-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'planner-autoloads)
+(setq remember-handler-functions '(remember-planner-append))
+(defvaralias 'remember-annotation-functions 'planner-annotation-functions)
diff --git a/app-emacs/planner/metadata.xml b/app-emacs/planner/metadata.xml
new file mode 100644
index 000000000000..845ffcf8eab9
--- /dev/null
+++ b/app-emacs/planner/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ Planner is a personal information manager (PIM) for Emacs. You can
+ use it to manage your tasks, schedules, notes and anything else you
+ want to store in a free-text richly-hyperlinked personal information
+ manager integrated into Emacs.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/planner/planner-3.42.ebuild b/app-emacs/planner/planner-3.42.ebuild
new file mode 100644
index 000000000000..7eddd75fd4c2
--- /dev/null
+++ b/app-emacs/planner/planner-3.42.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Maintain a local Wiki using Emacs-friendly markup"
+HOMEPAGE="https://www.emacswiki.org/emacs/PlannerMode"
+SRC_URI="http://download.gna.org/planner-el/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="test"
+
+RDEPEND=">=app-emacs/muse-3.02.6a
+ app-emacs/bbdb
+ app-emacs/emacs-w3m"
+DEPEND="${RDEPEND}
+ sys-apps/texinfo"
+PDEPEND="app-emacs/remember"
+
+SITEFILE="80${PN}-gentoo.el"
+ELISP_TEXINFO="planner-el.texi"
+DOCS="AUTHORS COMMENTARY ChangeLog* NEWS README"
+
+src_compile() {
+ default
+}
diff --git a/app-emacs/po-mode-0.19.3 b/app-emacs/po-mode-0.19.3
deleted file mode 100644
index 6983d80386a8..000000000000
--- a/app-emacs/po-mode-0.19.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Major mode for GNU gettext PO files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gettext/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gnu/gettext/gettext-0.19.3.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=41a3760efa85ed0da1f2858ecd891111
diff --git a/app-emacs/po-mode-0.19.4 b/app-emacs/po-mode-0.19.4
deleted file mode 100644
index 327aba775a7f..000000000000
--- a/app-emacs/po-mode-0.19.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Major mode for GNU gettext PO files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gettext/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gnu/gettext/gettext-0.19.4.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=d287ab343631ddff0ae2f17848f28495
diff --git a/app-emacs/po-mode-0.19.8.1 b/app-emacs/po-mode-0.19.8.1
deleted file mode 100644
index 06d9b1860183..000000000000
--- a/app-emacs/po-mode-0.19.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Major mode for GNU gettext PO files
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/gettext/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gnu/gettext/gettext-0.19.8.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=868f67ac75d796721e89e066a3cee0fb
diff --git a/app-emacs/po-mode/Manifest b/app-emacs/po-mode/Manifest
new file mode 100644
index 000000000000..0b9407323653
--- /dev/null
+++ b/app-emacs/po-mode/Manifest
@@ -0,0 +1,8 @@
+AUX 50po-mode-gentoo.el 373 BLAKE2B dedf37969c42ac3dbeb4b4cb01af0f9ee79e40aad8586831503bebc1192a110fbecdc0bba339ebe6d7f89a8509e4f6df52f98f7563a90f31d73af279aad81e66 SHA512 48c371afe3f1a1f033ea20cb0a60bc700414108f7dc1f235e62423bda9b94373e49da9bdd3ab76e119b7b6c1b5f0a7601d36ce2710dd23b3de46557cf7d9cd8d
+DIST gettext-0.19.3.tar.gz 17414357 BLAKE2B b2b2085e8ee7339c6b6509807a9601163498edd9265f2ec899337943bd2c1394a905b01e8a9f44e7a57985cb11f4fdfe302ff9320dacf1da78fdc4fdb5e30fd9 SHA512 2ec02065b376cf9ec2b9d32328a7181d292ac940356a710f785450f37e03a8513e07d4b981824374671cfa2f60024e4649fc89ad79ee0adda87a8b9b63ad28e8
+DIST gettext-0.19.4.tar.gz 17717034 BLAKE2B 2022ed7963ff01c842c345f13c33ea7cc7221629c6beaa73cee7af68f709c6b8824d1e93ef919318b5d0a63286821efe2fdffbbdd709edf25a1f25be8909222d SHA512 274e00fe0149468e3073562f8f3b292597e9dbd82dfe8d068e4a1983914d25b603bb26f3fa4aa10e9fcd65826e3552c1871218342270927481e95eb64288ad97
+DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
+EBUILD po-mode-0.19.3.ebuild 537 BLAKE2B 3d25b14bf751bd076c8564b023f95f5359029c59c1886664f2701eec59cd88d713743521881a02a6810940aa104416f0aa77675dbdef7e569d6fb325a5f4e452 SHA512 8c68235c48f5732bead7688739cc00588a9d49c57f800f935cdd3b3a0ef51ee135ce541f7a57cc22d2e0c1f9ffccf7957e04f9dd56da933340c3e21b2eccf48c
+EBUILD po-mode-0.19.4.ebuild 547 BLAKE2B 4ee75a670d6036faaf684669926db9a8b33cc939d7ae93bc24068ea1a7d0b9098978407d204cd56dcd43e9ea06c961ffd8b390a712a5bfccce18f729eb4b8f3f SHA512 45220bc03bab40288510bb6e33d29f75ea6da1263176d64381651f3c1aef24c584b0eda00a3bd248e756157efddaa05c7de5ebec164e2093303bce2546628bf2
+EBUILD po-mode-0.19.8.1.ebuild 553 BLAKE2B 5799809a62002f314e805c63c47d7b1ee608de724534ed2b06b1866d6f7df4207dd9fd00259cc3e6fd6b7b60529aab11a2232a4f3d1f16d93eeb2d939ae36aed SHA512 1dc5864fb2dc0df0c008d90a9362fed05ce1b8c6ca84da32350e8eb6e1b83e8ce7c125d52927fd5331fdb0d68641585ad927df848c5533322b14da071b8b385a
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/po-mode/files/50po-mode-gentoo.el b/app-emacs/po-mode/files/50po-mode-gentoo.el
new file mode 100644
index 000000000000..47adee8f6c5a
--- /dev/null
+++ b/app-emacs/po-mode/files/50po-mode-gentoo.el
@@ -0,0 +1,8 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'po-mode "po-mode" "Major mode for translators to edit PO files" t)
+(or (fboundp 'po-find-file-coding-system)
+ (autoload 'po-find-file-coding-system "po-compat"))
+
+(add-to-list 'auto-mode-alist '("\\.po\\'\\|\\.po\\." . po-mode))
+(modify-coding-system-alist 'file "\\.po\\'\\|\\.po\\."
+ 'po-find-file-coding-system)
diff --git a/app-emacs/po-mode/metadata.xml b/app-emacs/po-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/po-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/po-mode/po-mode-0.19.3.ebuild b/app-emacs/po-mode/po-mode-0.19.3.ebuild
new file mode 100644
index 000000000000..c8911054c996
--- /dev/null
+++ b/app-emacs/po-mode/po-mode-0.19.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Major mode for GNU gettext PO files"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
+ELISP_REMOVE="start-po.el"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/po-mode/po-mode-0.19.4.ebuild b/app-emacs/po-mode/po-mode-0.19.4.ebuild
new file mode 100644
index 000000000000..f113b3415ff8
--- /dev/null
+++ b/app-emacs/po-mode/po-mode-0.19.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Major mode for GNU gettext PO files"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
+ELISP_REMOVE="start-po.el"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/po-mode/po-mode-0.19.8.1.ebuild b/app-emacs/po-mode/po-mode-0.19.8.1.ebuild
new file mode 100644
index 000000000000..85a2aacdb3c3
--- /dev/null
+++ b/app-emacs/po-mode/po-mode-0.19.8.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Major mode for GNU gettext PO files"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
+ELISP_REMOVE="start-po.el"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/popwin-0.6.2 b/app-emacs/popwin-0.6.2
deleted file mode 100644
index e25061ba4463..000000000000
--- a/app-emacs/popwin-0.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Popup window manager for Emacs
-EAPI=5
-HOMEPAGE=https://github.com/m2ym/popwin-el/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/m2ym/popwin-el/tarball/v0.6.2 -> popwin-0.6.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=36fe7d81eae60eeda29847056d6e7418
diff --git a/app-emacs/popwin/Manifest b/app-emacs/popwin/Manifest
new file mode 100644
index 000000000000..b3cca907614a
--- /dev/null
+++ b/app-emacs/popwin/Manifest
@@ -0,0 +1,4 @@
+AUX 50popwin-gentoo.el 336 BLAKE2B 5f76341b524d373ed3aa8d15e99123f5be33a45eed4e865f647e8c40353bceefb8775dabadce9f0cbb630742893de1354dd09062ccc2cc4c4c68484ee380a02d SHA512 a9b72edf953d67a16aad44186d3f0f3deead224ce57342d73ba43abe15c0c2b170311380926d1195d98884b6e64fbeca23b74c3dd9a67b13015ec0b491861905
+DIST popwin-0.6.2.tar.gz 16821 BLAKE2B 6fcf2e711c28db3465fd4e267195f8526eff26aedeb04f07d66f5adac83f2447beef1ee988f692b9062a0e0eabbbe0760d3df6f1f7679fb4ab76317237aa8fdf SHA512 3c086361d6b79d7c68583cdbfb76cfd95b6ed56883382e42a863137d93e2a64fa8dce7b7873a4c46ce04a742942dd5f16367c691be608438079555578709b108
+EBUILD popwin-0.6.2.ebuild 471 BLAKE2B d76ac412dbdefe4a1449bd95b0552d5605e5fa5f27e4f4c4d2400b8f4bccaf3954d994e729927fb1537949aa4fdc52ba0af14ae234520b9bb88ca8000c2225b7 SHA512 a4dbeca3a4bd29b666fc533e01315fe02dae86ffad5653559ca3c4443189faf2b987d3b7960d04afa0a01425cc28f3a4f663d02b4bd56fd237bda367dcfedd23
+MISC metadata.xml 434 BLAKE2B 7a3d9e391906d94c7325bb2b3037ac72a17592c7000ea7952d1a24307972ac5e76197ab65757111c67b9e08714b5e8af3e96afa6b01ec6ebaba522bb07edcdcb SHA512 aecd01bc0b93d462be5de0f33709bde26740f9d5c86b926201a215c6eeedf79f8216d9906260f61b65f81f5850b958d1ac94a767775ddacee6df4547ec01efe9
diff --git a/app-emacs/popwin/files/50popwin-gentoo.el b/app-emacs/popwin/files/50popwin-gentoo.el
new file mode 100644
index 000000000000..bd00744ede00
--- /dev/null
+++ b/app-emacs/popwin/files/50popwin-gentoo.el
@@ -0,0 +1,6 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'popwin:display-buffer "popwin"
+ "Display BUFFER-OR-NAME, if possible, in a popup window, or as usual.
+This function can be used as a value of `display-buffer-function'." t)
+(autoload 'popwin:special-display-popup-window "popwin"
+ "The `special-display-function' with a popup window.")
diff --git a/app-emacs/popwin/metadata.xml b/app-emacs/popwin/metadata.xml
new file mode 100644
index 000000000000..ab2dca535eae
--- /dev/null
+++ b/app-emacs/popwin/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>naota@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">m2ym/popwin-el</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/popwin/popwin-0.6.2.ebuild b/app-emacs/popwin/popwin-0.6.2.ebuild
new file mode 100644
index 000000000000..f353fe5a47a0
--- /dev/null
+++ b/app-emacs/popwin/popwin-0.6.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp eutils
+
+DESCRIPTION="Popup window manager for Emacs"
+HOMEPAGE="https://github.com/m2ym/popwin-el/"
+SRC_URI="https://github.com/m2ym/${PN}-el/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md NEWS.md"
+
+src_unpack() {
+ unpack ${A}
+ mv m2ym-popwin-el-* ${P} || die
+}
diff --git a/app-emacs/pov-mode-3.3 b/app-emacs/pov-mode-3.3
deleted file mode 100644
index b315c088aef2..000000000000
--- a/app-emacs/pov-mode-3.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=Emacs mode for povray
-EAPI=4
-HOMEPAGE=http://gitorious.org/pov-mode/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 FDL-1.2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://gitorious.org/pov-mode/pov-mode/archive-tarball/v3.3 -> pov-mode-3.3.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=1d3e447754238df65c797f171522473f
diff --git a/app-emacs/pov-mode/Manifest b/app-emacs/pov-mode/Manifest
new file mode 100644
index 000000000000..f2dbe43a1b13
--- /dev/null
+++ b/app-emacs/pov-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50pov-mode-gentoo.el 423 BLAKE2B e622ca33adb577987c9d68e1baa2e7415e12cb74866cf64f16f693f06fa886866d3154e68cdbffaf2d929f50ffc8db29ef2c6b356f98f873eced5ee8ff4da518 SHA512 d2d27e6770909ebd08a8c53dbfba3896aca814637c861623746e66097f0f21686507322c734c0a48e15ee281cca0e51a82fff716276f9aec65e5a1419c8dc028
+DIST pov-mode-3.3.tar.gz 65929 BLAKE2B eddaa355b58ad397e377c055fbc06fcdf552fd32057246d11d9b11908635da72c9b19e8b2179fcad54bbe5a5d158a36faf0d42e62b79d4a4e5a57405672dafde SHA512 e705f25f1eb719152dbf5ec17c833f67b4c7be5b1ff9ddab94f67830d9d2caddabc47bcc6ce4864521eedd2728f4b59a6d2c0ddaba83f0b194bb0834d86e9396
+EBUILD pov-mode-3.3.ebuild 615 BLAKE2B 9a69e7ac29c7b44f42380b9e363e339340dac9e2bd052008f903f2df0e135525e1108c63317bef38b4808043674cf83da99fb2267db179bd24babaec5d048f89 SHA512 e2b80cf0fba25fc171d4e3f6c2f07ba65a091470a630cd8efaf1cd19ca4070dc6e7db1f22131c45f4945077504be4fa05ba4a62f02eeacdb211059e7ba174ddd
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/pov-mode/files/50pov-mode-gentoo.el b/app-emacs/pov-mode/files/50pov-mode-gentoo.el
new file mode 100644
index 000000000000..0489820ec5f6
--- /dev/null
+++ b/app-emacs/pov-mode/files/50pov-mode-gentoo.el
@@ -0,0 +1,9 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'pov-mode "pov-mode" "PoVray scene file mode" t)
+(add-to-list 'auto-mode-alist '("\\.pov\\'" . pov-mode))
+;;(add-to-list 'auto-mode-alist '("\\.inc\\'" . pov-mode))
+
+;; Override customization variables setting various directories.
+(setq pov-include-dir "/usr/share/povray/include")
+(setq pov-insertmenu-location "@SITEETC@/InsertMenu")
+(setq pov-icons-location "@SITEETC@/")
diff --git a/app-emacs/pov-mode/metadata.xml b/app-emacs/pov-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/pov-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/pov-mode/pov-mode-3.3.ebuild b/app-emacs/pov-mode/pov-mode-3.3.ebuild
new file mode 100644
index 000000000000..4251766d372c
--- /dev/null
+++ b/app-emacs/pov-mode/pov-mode-3.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Emacs mode for povray"
+HOMEPAGE="http://gitorious.org/pov-mode/"
+SRC_URI="http://gitorious.org/${PN}/${PN}/archive-tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-apps/texinfo"
+
+S="${WORKDIR}/${PN}-${PN}"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_REMOVE="${PN}-pkg.el ${PN}.info"
+ELISP_TEXINFO="info/${PN}.texi"
+DOCS="README"
+
+src_install() {
+ elisp_src_install
+ insinto ${SITEETC}/${PN}
+ doins *.xpm
+ doins -r InsertMenu/
+}
diff --git a/app-emacs/prom-wl-2.7.0-r1 b/app-emacs/prom-wl-2.7.0-r1
deleted file mode 100644
index 7feb2224748d..000000000000
--- a/app-emacs/prom-wl-2.7.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Procmail reader for Wanderlust
-EAPI=0
-HOMEPAGE=http://www.h6.dion.ne.jp/~nytheta/software/prom-wl.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-emacs/wanderlust >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.h6.dion.ne.jp/~nytheta/software/pub/prom-wl-2.7.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=3d140981be32ee2cccec37aea048bf9a
diff --git a/app-emacs/prom-wl/Manifest b/app-emacs/prom-wl/Manifest
new file mode 100644
index 000000000000..de5ec1b62e46
--- /dev/null
+++ b/app-emacs/prom-wl/Manifest
@@ -0,0 +1,4 @@
+AUX 50prom-wl-gentoo.el 112 BLAKE2B 7ffd40f1c3dc3d1ca120f4e8a9bacaeaace55ac5640de3bc7ea19c7bf626ed26029156daf718aac892021a13d7b4ff7c77f0da8b893120834ec236087bfb9adf SHA512 a3d7c1f810ed7ef673bfeb062cf1cd3c82132c406183c065a9e03fc0ef0bc8a747cd7b8bf04e7f8f8e3fa84530e06ab63f9ca66b9acb642dc3077c65056f814e
+DIST prom-wl-2.7.0.tar.gz 10563 BLAKE2B 63bbd6f708a21b403f30c44493023841242bcc8aed667ddc501933f46abe8e29138502b57d500b4b58056b190d4571d6ef4dda9a9eda7695b7f34c38f8049af2 SHA512 c05d61761b8c050bb6c09f3028f54351d3ffed5a17bb8519be76c8c706df825569cccfc8cd1ff2b656ef885a9606768eeb1b3dc0955ff4316bbe35c5db8ed989
+EBUILD prom-wl-2.7.0-r1.ebuild 454 BLAKE2B 47f47581141f73f08144e3fc4867370758fa7a4232e0049cfc2f33369ea7dcb916a1a0ff043b8d6b4cf69f451f1f92eec777fb344711f237f0c6bced09c570c8 SHA512 4f59f373039ad07599bf0d96902653840640d95b9aa9cbdf24913507c9e4d67dc286180d1fe7b14a0c96c95ed29c4009b6a7bd7a0e8e35cc8a461aeb0e4a52d6
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/prom-wl/files/50prom-wl-gentoo.el b/app-emacs/prom-wl/files/50prom-wl-gentoo.el
new file mode 100644
index 000000000000..8eab391ee220
--- /dev/null
+++ b/app-emacs/prom-wl/files/50prom-wl-gentoo.el
@@ -0,0 +1,5 @@
+
+;;; prom-wl site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'prom-wl "prom-wl" nil t)
diff --git a/app-emacs/prom-wl/metadata.xml b/app-emacs/prom-wl/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/prom-wl/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/prom-wl/prom-wl-2.7.0-r1.ebuild b/app-emacs/prom-wl/prom-wl-2.7.0-r1.ebuild
new file mode 100644
index 000000000000..2b6067a0c53f
--- /dev/null
+++ b/app-emacs/prom-wl/prom-wl-2.7.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit elisp
+
+DESCRIPTION="Procmail reader for Wanderlust"
+HOMEPAGE="http://www.h6.dion.ne.jp/~nytheta/software/prom-wl.html"
+SRC_URI="http://www.h6.dion.ne.jp/~nytheta/software/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-emacs/wanderlust"
+
+SITEFILE=50${PN}-gentoo.el
+DOCS="prom-wl-usage.jis"
diff --git a/app-emacs/proofgeneral-4.2 b/app-emacs/proofgeneral-4.2
deleted file mode 100644
index d331770eb646..000000000000
--- a/app-emacs/proofgeneral-4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/mmm-mode-0.4.8-r2 >=virtual/emacs-23
-DESCRIPTION=A generic interface for proof assistants
-EAPI=5
-HOMEPAGE=http://proofgeneral.inf.ed.ac.uk/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=app-emacs/mmm-mode-0.4.8-r2 >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.2.tgz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=6c2ea7ea38869e682388bf70048f2a3d
diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
new file mode 100644
index 000000000000..8b03b5b1faca
--- /dev/null
+++ b/app-emacs/proofgeneral/Manifest
@@ -0,0 +1,5 @@
+AUX 50proofgeneral-gentoo.el 68 BLAKE2B 14c41f176f78dee51fdb893f355c2b8cf00456e0b586c7c41c91f2eea6f8d0baaf8d6a04eda385031c96c138d47c0e7e99a75be7cd27ffd0d2087e0a69ded0b2 SHA512 32f3d33d85776f1695d542adadb8e35e372659fcce2805fc205732cd911be186cd5a1a63a8438287467dea744da9ef212f7338c0edb735a525ec30f892f1afca
+AUX proofgeneral-4.2-bytecomp-warn.patch 1150 BLAKE2B 0e4b577a1fcdbf27d2a75055ddbb970945d494ae4de2f01da4c4b1c8fc7c39bd8745a5e62abd3a7f401cb4d2ef5f30452dfae9c1899b85d7929fe4ed87bc3a66 SHA512 ad7f972148cec19c60d58e7ee7808735b92d6f642d178453d123988c68e873824a7bf8ceeded82dfd3b6109e5b50e24bd7fa8753822b5f36cbb2e73ff4e0d30f
+DIST ProofGeneral-4.2.tgz 1613190 BLAKE2B e12913d67f95b20d99d5bdaa82a36f0dd2b664441a86dc86cb4f8afaac2379691c01e60cfe6af3bbf177f0dc2f82ce34ea4d706ee34c2d5986de3f807ce05045 SHA512 102c56a1bc113439b1fa8aa10efe571d47d68b344d3489fe18ca3bdbf8828bb31fd2302a68a4bd639c59c429d41e82e5d933abddd3444781cb0e8a603db432ab
+EBUILD proofgeneral-4.2.ebuild 1385 BLAKE2B 53d5c6afb8058ea87d4b78a23a8bf20d9e7dc2ce84b25eae8f57a16df35508ae9677698f781c8e5ffa5b7aaec306825ffbdd02dba69263ccbe0c7f5dc9faaf58 SHA512 e0e59f6ec4b73a47ee44be048a7139246502f642cda5f1a9a0a5ea3b20f37158c5109b9701ac1eeacb0f154a0b0dba34270f2d2ca418665c9e5e2c2a435b68fc
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/proofgeneral/files/50proofgeneral-gentoo.el b/app-emacs/proofgeneral/files/50proofgeneral-gentoo.el
new file mode 100644
index 000000000000..4839b17f1f58
--- /dev/null
+++ b/app-emacs/proofgeneral/files/50proofgeneral-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@/generic")
+(require 'proof-site)
diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch b/app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch
new file mode 100644
index 000000000000..b34321bf392b
--- /dev/null
+++ b/app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/445242
+http://proofgeneral.inf.ed.ac.uk/trac/ticket/458
+
+--- ProofGeneral-4.2-orig/Makefile
++++ ProofGeneral-4.2/Makefile
+@@ -62,7 +62,7 @@
+ # only during compilation. Another idea: put a function in proof-site
+ # to output the compile-time load path and ELISP_DIRS so these are set
+ # just in that one place.
+-BYTECOMP = $(BATCHEMACS) -eval '(setq load-path (append (mapcar (lambda (d) (concat "${PWD}/" (symbol-name d))) (quote (${ELISP_DIRS}))) load-path))' -eval '(progn (require (quote bytecomp)) (require (quote mouse)) (require (quote tool-bar)) (require (quote fontset)) (setq byte-compile-warnings (remove (quote cl-functions) (remove (quote noruntime) byte-compile-warning-types))) (setq byte-compile-error-on-warn t))' -f batch-byte-compile
++BYTECOMP = $(BATCHEMACS) -eval '(setq load-path (append (mapcar (lambda (d) (concat "${PWD}/" (symbol-name d))) (quote (${ELISP_DIRS}))) load-path))' -eval '(progn (require (quote bytecomp)) (require (quote mouse)) (require (quote tool-bar)) (require (quote fontset)))' -f batch-byte-compile
+ EL=$(shell for f in $(ELISP_DIRS); do ls $$f/*.el; done)
+ ELC=$(EL:.el=.elc)
+
diff --git a/app-emacs/proofgeneral/metadata.xml b/app-emacs/proofgeneral/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/proofgeneral/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/proofgeneral/proofgeneral-4.2.ebuild b/app-emacs/proofgeneral/proofgeneral-4.2.ebuild
new file mode 100644
index 000000000000..f3b2ee9fff92
--- /dev/null
+++ b/app-emacs/proofgeneral/proofgeneral-4.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+MY_PN="ProofGeneral"
+DESCRIPTION="A generic interface for proof assistants"
+HOMEPAGE="http://proofgeneral.inf.ed.ac.uk/"
+SRC_URI="http://proofgeneral.inf.ed.ac.uk/releases/${MY_PN}-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND=">=app-emacs/mmm-mode-0.4.8-r2"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+ELISP_PATCHES="${P}-bytecomp-warn.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+ sed -i -e '/^OTHER_ELISP/s:contrib/mmm::' Makefile || die
+}
+
+src_compile() {
+ # remove precompiled lisp files
+ emake clean
+ emake -j1 compile EMACS=emacs
+}
+
+src_install() {
+ emake -j1 install EMACS=emacs PREFIX="${D}"/usr
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${MY_PN}
+
+ doinfo doc/*.info*
+ doman doc/proofgeneral.1
+ dohtml doc/ProofGeneral/*.html doc/PG-adapting/*.html
+ dodoc AUTHORS BUGS CHANGES COMPATIBILITY FAQ INSTALL README REGISTER
+
+ # clean up
+ rm -rf "${D}/usr/share/emacs/site-lisp/site-start.d"
+ rm -rf "${D}/usr/share/application-registry"
+ rm -rf "${D}/usr/share/mime-info"
+}
+
+pkg_postinst() {
+ elisp-site-regen
+ elog "Please register your use of Proof General on the web at:"
+ elog " http://proofgeneral.inf.ed.ac.uk/register "
+ elog "(see the REGISTER file for more information)"
+}
diff --git a/app-emacs/protbuf-1.7-r1 b/app-emacs/protbuf-1.7-r1
deleted file mode 100644
index 68504c24fb32..000000000000
--- a/app-emacs/protbuf-1.7-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Protect Emacs buffers from accidental killing
-EAPI=5
-HOMEPAGE=http://www.splode.com/~friedman/software/emacs-lisp/ https://www.emacswiki.org/emacs/ProtectingBuffers
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/protbuf-1.7.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=33a7bc541106ab1268d2d4a72591c33d
diff --git a/app-emacs/protbuf/Manifest b/app-emacs/protbuf/Manifest
new file mode 100644
index 000000000000..527c89db6faa
--- /dev/null
+++ b/app-emacs/protbuf/Manifest
@@ -0,0 +1,4 @@
+AUX 50protbuf-gentoo.el 529 BLAKE2B 49ab3c50c3093fa9895f3adfd9084143eb395e700f0b30c4fe36e73436e368475142d4f0a0e458f54d36a468f60cfebe56491c2618aeec8c68ecfd6cf3289020 SHA512 f1cd37bdeb9568cbff9ffb989334237213b8c1bc50704195708fcac4848cc3c128c8121422a0ea42af8c2ee94647e325cd293e4b29c513ad8cdeb37d33fd3f4c
+DIST protbuf-1.7.tar.bz2 2270 BLAKE2B fa840549e785dcccbca53e4ddad7b6572f6da0191d3b82544ed562a4e1d6e6a28e1cc44aaf81498a0f6c8f9ef6d37451104b6552bb0c8469029d0589489d03e5 SHA512 9dad81784b71234812ac35be695895c3063e5337dddbed73b28fde800d12110cec6bb9faa42b6ed74d9a2d4f12da96b8e692d193edfc775fd33a7922a019b8b2
+EBUILD protbuf-1.7-r1.ebuild 428 BLAKE2B 54a1b73625827ac00432da8c06462e4521ae13efc8e46fa6d8c3d6d4d12af38de88c9af7d9e04b19c5431abcf717eefb703ded174440357454cb71db825aa84f SHA512 d7f3a6edbf92e455f4cee976b53b202c50e77801e9aa3c5494286417d7f9fe3908ab40c4db0365b99d429d46c51677781e04aa1354357b24fd21f45a6cba269b
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/protbuf/files/50protbuf-gentoo.el b/app-emacs/protbuf/files/50protbuf-gentoo.el
new file mode 100644
index 000000000000..f64466f67ed8
--- /dev/null
+++ b/app-emacs/protbuf/files/50protbuf-gentoo.el
@@ -0,0 +1,12 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'protect-buffer-from-kill-mode "protbuf"
+ "Protect buffer from being killed.
+To remove this protection, call this command with a negative prefix argument."
+ t)
+(autoload 'protect-process-buffer-from-kill-mode "protbuf"
+ "Protect buffer from being killed as long as it has an active process.
+To remove this protection, call this command with a negative prefix argument."
+ t)
+(autoload 'protect-buffer-from-kill "protbuf")
+(autoload 'protect-process-buffer-from-kill "protbuf")
diff --git a/app-emacs/protbuf/metadata.xml b/app-emacs/protbuf/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/protbuf/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/protbuf/protbuf-1.7-r1.ebuild b/app-emacs/protbuf/protbuf-1.7-r1.ebuild
new file mode 100644
index 000000000000..f175a542b6b0
--- /dev/null
+++ b/app-emacs/protbuf/protbuf-1.7-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Protect Emacs buffers from accidental killing"
+HOMEPAGE="http://www.splode.com/~friedman/software/emacs-lisp/
+ https://www.emacswiki.org/emacs/ProtectingBuffers"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/psgml-1.4.0 b/app-emacs/psgml-1.4.0
deleted file mode 100644
index f2f5e8009319..000000000000
--- a/app-emacs/psgml-1.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-text/openjade >=virtual/emacs-23
-DESCRIPTION=A GNU Emacs Major Mode for editing SGML and XML coded documents
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/psgml/ https://www.emacswiki.org/emacs/PsgmlMode
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2+ Texinfo-manual
-RDEPEND=app-text/openjade >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.fsavigny.de/gpled-software/psgml-1.4.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=ffe97c67a6abff87b1163e7eb678217a
diff --git a/app-emacs/psgml/Manifest b/app-emacs/psgml/Manifest
new file mode 100644
index 000000000000..44ac89587781
--- /dev/null
+++ b/app-emacs/psgml/Manifest
@@ -0,0 +1,4 @@
+AUX 50psgml-gentoo.el 295 BLAKE2B d2276bb66871f2dfeec692358fd49fa226c7141ff3b9e0020c05b7d873cf65fa1d4f117724ff3baf2ea3520bf85cdccd90129bf54da815bb44de19c279e0cddf SHA512 ecb9a8c544e0b5e287771d6538d36ab67076d0fc68b55bbc5428aa99b9c5f773f01499dad6f2d624d99648ddbb30518522da3f39d244fe30b4d884567114daa1
+DIST psgml-1.4.0.tar.gz 262246 BLAKE2B e888e7e13b39108efd19bbce41f3630015556ca9e5250665456866173302b5388add506694f28a6fa7e4e4572ce4596eec66762650f7203a14d84fcfbcd8ac7f SHA512 99bab6440a0f437009edff6371412c16f47d48c6b1eaa5b894523130e3a8d604ea79dc81f1895ceecd4283d0c7fd908d4e5bdeace63e54b9ac048a80fc0f6f44
+EBUILD psgml-1.4.0.ebuild 827 BLAKE2B e8425bab4b9f39686ba920f5c771a1a25565105cd1370ec6d7f2e5ea0587b5a3c0e3b614610d31e0bac5a82dae7b1142268fbfdb1fd0126d183358b5d02561ae SHA512 2e1778fa2efb8596b991314cfa0a3f43df0a9471aa3a4b44c8d8631d92479f3c14f3ab10b3dc911d27b46ee076c91c448e68ce621608b5c7463b3b7d664ef4a3
+MISC metadata.xml 355 BLAKE2B 8bf344b65a3b56830144a7413adbe5424f6cf1e043997982a961bd68c33538a6db10e42fb244150b7d77012ce3965cfbebe3b2dca3ccf39347c3391752cddc45 SHA512 8bffed60efe4fdef36e4abe3d9a7bce5617ce7da934a072cb52a26d8a935d0a78ddf8bc562033d59724bf0845f6ca60794ab54aa7ea76a755d4578d08f967ef4
diff --git a/app-emacs/psgml/files/50psgml-gentoo.el b/app-emacs/psgml/files/50psgml-gentoo.el
new file mode 100644
index 000000000000..e69efe77d8f0
--- /dev/null
+++ b/app-emacs/psgml/files/50psgml-gentoo.el
@@ -0,0 +1,6 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'sgml-mode "psgml" "Major mode to edit SGML files." t)
+(autoload 'xml-mode "psgml" "Major mode to edit XML files." t)
+(setq sgml-catalog-files '("CATALOG" "/etc/sgml/catalog"))
+(setq sgml-display-char-list-filename
+ "@SITEETC@/iso88591.map")
diff --git a/app-emacs/psgml/metadata.xml b/app-emacs/psgml/metadata.xml
new file mode 100644
index 000000000000..e3cf9243cef1
--- /dev/null
+++ b/app-emacs/psgml/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">psgml</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/psgml/psgml-1.4.0.ebuild b/app-emacs/psgml/psgml-1.4.0.ebuild
new file mode 100644
index 000000000000..4d38464f5803
--- /dev/null
+++ b/app-emacs/psgml/psgml-1.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A GNU Emacs Major Mode for editing SGML and XML coded documents"
+HOMEPAGE="https://sourceforge.net/projects/psgml/
+ https://www.emacswiki.org/emacs/PsgmlMode"
+SRC_URI="http://www.fsavigny.de/gpled-software/${P}.tar.gz"
+
+LICENSE="GPL-2+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="app-text/openjade"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ ${EMACS} ${EMACSFLAGS} --load psgml-maint.el -f psgml-compile-files || die
+}
+
+src_install() {
+ elisp-install ${PN} *.el *.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ insinto "${SITEETC}/${PN}"
+ doins *.map
+ doinfo psgml.info psgml-api.info
+ dodoc ChangeLog INSTALL README.psgml psgml.ps
+}
diff --git a/app-emacs/puppet-mode-0.3-r1 b/app-emacs/puppet-mode-0.3-r1
deleted file mode 100644
index e061e88718bf..000000000000
--- a/app-emacs/puppet-mode-0.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major mode for editing Puppet manifests
-EAPI=6
-HOMEPAGE=https://github.com/voxpupuli/puppet-mode
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/0.3.tar.gz -> puppet-mode-0.3.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=e4a9dbfd4450767946ea207b47218536
diff --git a/app-emacs/puppet-mode-0.3.20171221 b/app-emacs/puppet-mode-0.3.20171221
deleted file mode 100644
index 712e8110bfc9..000000000000
--- a/app-emacs/puppet-mode-0.3.20171221
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major mode for editing Puppet manifests
-EAPI=6
-HOMEPAGE=https://github.com/voxpupuli/puppet-mode
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/b3ed5057166a4f49dfa9be638523a348b55a2fd2.tar.gz -> puppet-mode-0.3.20171221.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=bbb591e196ab9e0f8ab1527b583ec63e
diff --git a/app-emacs/puppet-mode/Manifest b/app-emacs/puppet-mode/Manifest
new file mode 100644
index 000000000000..0556f3a134d0
--- /dev/null
+++ b/app-emacs/puppet-mode/Manifest
@@ -0,0 +1,7 @@
+AUX 50puppet-mode-1-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
+AUX puppet-mode-0.3-version.patch 547 BLAKE2B a3731babc0e9d207c5dde31f28f0a3e2481679bc2d95f9fdadc77e153689bf6e7c1498acb93e1783863bc66de1e65ecb332a4a605fb6c3856dc8964a42e4dd5e SHA512 623496493b6f920700e042c69099060b9e89cec3a04281af0d8fb7b32c57cfa9b70833935f1ec723c4e877545ac0962b9c70054891084b50c6eb2ad8bb1eb9f2
+DIST puppet-mode-0.3.20171221.tar.gz 36707 BLAKE2B 97b285e409a1e344c12773fd1fa64c87090c883662f87fbf01f5b535e5c9027a035b6c4656ac6ca138cf872b05ff8f05af2478f2bfa5b04a10168507b48c387c SHA512 12db350e4005d2b13d8e936f1a956c3bd603709a7a88489565fd4be3a8e74c7b33e6523a7371db85927c018c260762467d6e50153eea659f87711426df7774fc
+DIST puppet-mode-0.3.tar.gz 25617 BLAKE2B a9afb8e2f6c0a2b40cef6bb39d0fa2effe2ddffaa3b646562f0fc5b84d1613e556df88206835d6aad5862d526161d69c49ecd188e299e4f4175b479fe1957eee SHA512 16ba5f71a1ec6c40b1eddf2acf5c1aa1968526b959279e1cac0cfac947f82f404fc35978ce12f5851309f293e2c92f054a718ade97d156528d505dcda58434e8
+EBUILD puppet-mode-0.3-r1.ebuild 613 BLAKE2B f98dab8fc53fcd00f2b3156ee8572d4c11181ff5d6660dda7b172e99f6ad7abf7f826c423e9500aacaa6d273c51b6acf3725deb76ab155ba5a5f4c34348382ca SHA512 12a42f2ecce4bce4b2963e22dd7c4b9f9545f1ccbb8713c0cf4344ee00da59b42e3eb5922b3b20e161d946aa7314a5c95df1a61797842e0ffcad4ae43e4f92e3
+EBUILD puppet-mode-0.3.20171221.ebuild 696 BLAKE2B 880055162bb6a62c1ce6ad5cf1843c8213aa24dbd56ef0664848320a349fac820c95e0dadbf17a3c3b5bb421230559b1f080c8bfb694ad19ca5e90f867380051 SHA512 4ce05b8aa028fdffca6b21c8309ddc4bf71bbf6e5ab183f4d3ed1028c97d556eb3914aaa7a7778cf75070d02998d6e31a90874618bb935e4d50468ef96adda47
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/puppet-mode/files/50puppet-mode-1-gentoo.el b/app-emacs/puppet-mode/files/50puppet-mode-1-gentoo.el
new file mode 100644
index 000000000000..64c38ae5a31d
--- /dev/null
+++ b/app-emacs/puppet-mode/files/50puppet-mode-1-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; puppet-mode site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests")
+(add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode))
diff --git a/app-emacs/puppet-mode/files/puppet-mode-0.3-version.patch b/app-emacs/puppet-mode/files/puppet-mode-0.3-version.patch
new file mode 100644
index 000000000000..513329dec1a2
--- /dev/null
+++ b/app-emacs/puppet-mode/files/puppet-mode-0.3-version.patch
@@ -0,0 +1,20 @@
+--- a/puppet-mode.el.~1~ 2014-03-13 16:30:50.000000000 +0100
++++ b/puppet-mode.el 2017-06-30 14:38:22.749240233 +0200
+@@ -72,8 +72,6 @@
+
+
+ ;;;; Requirements
+-(require 'pkg-info)
+-
+ (require 'cl-lib)
+ (require 'rx)
+ (require 'align)
+@@ -165,7 +163,7 @@
+ if called interactively, or if SHOW-VERSION is non-nil, otherwise
+ just return nil."
+ (interactive (list t))
+- (let ((version (pkg-info-version-info 'puppet-mode)))
++ (let ((version "@VERSION@"))
+ (when show-version
+ (message "Puppet Mode version: %s" version))
+ version))
diff --git a/app-emacs/puppet-mode/metadata.xml b/app-emacs/puppet-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/puppet-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild b/app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild
new file mode 100644
index 000000000000..71d3827097d7
--- /dev/null
+++ b/app-emacs/puppet-mode/puppet-mode-0.3-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing Puppet manifests"
+HOMEPAGE="https://github.com/voxpupuli/puppet-mode"
+SRC_URI="https://github.com/voxpupuli/puppet-mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+
+DOCS="CHANGES.rst README.rst"
+SITEFILE="50${PN}-1-gentoo.el"
+ELISP_PATCHES=( "${FILESDIR}/${PN}-0.3-version.patch" )
+
+src_prepare() {
+ elisp_src_prepare
+
+ sed -i -e 's/@VERSION@/'${PV}'/' puppet-mode.el || die
+}
diff --git a/app-emacs/puppet-mode/puppet-mode-0.3.20171221.ebuild b/app-emacs/puppet-mode/puppet-mode-0.3.20171221.ebuild
new file mode 100644
index 000000000000..2cf8f9430f72
--- /dev/null
+++ b/app-emacs/puppet-mode/puppet-mode-0.3.20171221.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+COMMIT=b3ed5057166a4f49dfa9be638523a348b55a2fd2
+
+DESCRIPTION="Emacs major mode for editing Puppet manifests"
+HOMEPAGE="https://github.com/voxpupuli/puppet-mode"
+SRC_URI="https://github.com/voxpupuli/puppet-mode/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+
+DOCS="CHANGES.md README.md"
+SITEFILE="50${PN}-1-gentoo.el"
+
+# Tests require unpackaged ert-runner
+RESTRICT="test"
+
+src_prepare() {
+ elisp_src_prepare
+
+ sed -i -e 's/@VERSION@/'${PV}'/' puppet-mode.el || die
+}
diff --git a/app-emacs/pymacs-0.25-r2 b/app-emacs/pymacs-0.25-r2
deleted file mode 100644
index 0d871d7c4365..000000000000
--- a/app-emacs/pymacs-0.25-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=doc? ( >=dev-python/docutils-0.7 virtual/latex-base ) >=virtual/emacs-23 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A tool that allows both-side communication beetween Python and Emacs Lisp
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/PyMacs
-IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/pinard/Pymacs/tarball/v0.25 -> pymacs-0.25.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0c83fd58e7feccc536ef542ee445103f
diff --git a/app-emacs/pymacs/Manifest b/app-emacs/pymacs/Manifest
new file mode 100644
index 000000000000..e1cd1971cc1f
--- /dev/null
+++ b/app-emacs/pymacs/Manifest
@@ -0,0 +1,4 @@
+AUX 50pymacs-gentoo.el 183 BLAKE2B f1a4b874bb339b653c4fb6fb186bd7e531151c34d1df58be6963288d4443438fcae0f82c92a1667b4e7cb739bc2f7c6fd8d8d5f6d4e91413ee5bec47a609cc2e SHA512 f59fed86f859b796c901088b38fb570a5e5527d774a15456105ce75598c31fd20d0afaa62ad9cbf12063810fa592dbbd7c33aaece5871b36b488e5af6de0fac2
+DIST pymacs-0.25.tar.gz 120597 BLAKE2B 837c67d862c11d2a9d74cb55a055f60627834a50717d5386ec604db70a62270aa2ad3e56942602dc10a5f997ab3ce6d7f91e29a8c5b959144286182ad861b3bb SHA512 e17f7ee754413e21403d23894ee263fb0edae180a60c746b02cf101b2f0c782116e7bb61215bd0a8c689a991e211d780d220d4672b58f43108e7218a6f0c8dc0
+EBUILD pymacs-0.25-r2.ebuild 1279 BLAKE2B bb728892bc5a2386f9ec663a137666f1c9c46632c4d9d086ddfdff2b0f1797e997ddef54a3a35c0cc02c86db9616ad687d357a5997e012eb7251db3b89f597d3 SHA512 30c8a587a138564a9a2def942b83be10ee6f55e776dbd90199461b28669e13a705316fef347c4b68947b9e0a53273215dd9bb59c6baa2bd6ea7ee05e7a41fe2d
+MISC metadata.xml 434 BLAKE2B 11fe7bc8c9fa32f4762237f30e93ae5281b73b10a99e389d6cad284f6ba649b7f732fd07aefec8f50d7175af301e021ad34cfac65adfbfb7dc6133184725cbb2 SHA512 899211703ed0824e0b2dd26018e46854ab970d76ee12f169b99bc3a49f9e3bfb1d42757c35ac1ac21268b90b8536737aab61cf9dd4f7297b4e5360f1fe73f821
diff --git a/app-emacs/pymacs/files/50pymacs-gentoo.el b/app-emacs/pymacs/files/50pymacs-gentoo.el
new file mode 100644
index 000000000000..8c59be7e3365
--- /dev/null
+++ b/app-emacs/pymacs/files/50pymacs-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'pymacs-load "pymacs" nil t)
+(autoload 'pymacs-eval "pymacs" nil t)
+(autoload 'pymacs-apply "pymacs")
+(autoload 'pymacs-call "pymacs")
diff --git a/app-emacs/pymacs/metadata.xml b/app-emacs/pymacs/metadata.xml
new file mode 100644
index 000000000000..f928f5ea6cdb
--- /dev/null
+++ b/app-emacs/pymacs/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+</maintainer>
+<upstream>
+ <remote-id type="github">pinard/Pymacs</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/pymacs/pymacs-0.25-r2.ebuild b/app-emacs/pymacs/pymacs-0.25-r2.ebuild
new file mode 100644
index 000000000000..edc51a95f82d
--- /dev/null
+++ b/app-emacs/pymacs/pymacs-0.25-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit elisp distutils-r1 vcs-snapshot
+
+DESCRIPTION="A tool that allows both-side communication beetween Python and Emacs Lisp"
+HOMEPAGE="https://www.emacswiki.org/emacs/PyMacs"
+SRC_URI="https://github.com/pinard/Pymacs/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc"
+
+DEPEND="doc? (
+ >=dev-python/docutils-0.7
+ virtual/latex-base )
+"
+RDEPEND=""
+
+DISTUTILS_IN_SOURCE_BUILD=1
+SITEFILE="50${PN}-gentoo.el"
+
+python_prepare_all() {
+ sed \
+ -e '/pymacs-python-command/s/@PYTHON@/python/' \
+ -i pymacs.el.in || die
+ distutils-r1_python_prepare_all
+}
+
+# called by distutils-r1 for every python implementation
+python_configure() {
+ # pre-process the files but don't run distutils
+ emake PYSETUP=: PYTHON=${EPYTHON}
+}
+
+# called once
+python_compile_all() {
+ elisp_src_compile
+ if use doc; then
+ VARTEXFONTS="${T}"/fonts emake RST2LATEX=rst2latex.py pymacs.pdf
+ fi
+}
+
+python_install_all() {
+ elisp_src_install
+
+ distutils-r1_python_install_all
+ dodoc pymacs.rst
+ use doc && dodoc pymacs.pdf
+}
diff --git a/app-emacs/python-mode-6.1.2 b/app-emacs/python-mode-6.1.2
deleted file mode 100644
index cf026a086d78..000000000000
--- a/app-emacs/python-mode-6.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Emacs major mode for editing Python source
-EAPI=5
-HOMEPAGE=https://launchpad.net/python-mode
-KEYWORDS=amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://launchpad.net/python-mode/trunk/6.1.2/+download/python-mode.el-6.1.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bd16f700e6799d0c3a1e033d343b7bea
diff --git a/app-emacs/python-mode-6.2.0 b/app-emacs/python-mode-6.2.0
deleted file mode 100644
index 6b244e85ad0f..000000000000
--- a/app-emacs/python-mode-6.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Emacs major mode for editing Python source
-EAPI=5
-HOMEPAGE=https://launchpad.net/python-mode
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://launchpad.net/python-mode/trunk/6.2.0/+download/python-mode.el-6.2.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8aef7350405f30f41fa84b7664655084
diff --git a/app-emacs/python-mode-6.2.3 b/app-emacs/python-mode-6.2.3
deleted file mode 100644
index 4ae98732ea4c..000000000000
--- a/app-emacs/python-mode-6.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Emacs major mode for editing Python source
-EAPI=6
-HOMEPAGE=https://launchpad.net/python-mode
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://launchpad.net/python-mode/trunk/6.2.3/+download/python-mode.el-6.2.3.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=5ed12d6f060ca1949442f72b58913668
diff --git a/app-emacs/python-mode/Manifest b/app-emacs/python-mode/Manifest
new file mode 100644
index 000000000000..021c7f531900
--- /dev/null
+++ b/app-emacs/python-mode/Manifest
@@ -0,0 +1,8 @@
+AUX 50python-mode-gentoo.el 541 BLAKE2B a1657fc49011246ba1cfed1cd8993a222c4932516c6a8e3be4fcc53200510ad8e9a3e1072c2bce641cded4be1581a9c950991d6864c2136668ddba4de8f2429d SHA512 8e1c2c68409c48f3e7c2ae36128380fd5358a12470db571ffa22b1c9cb11730a2f2a84ec66f23c064e32b504c8ae002033e77640d85e11577c50e31462cd5274
+DIST python-mode.el-6.1.2.tar.gz 330107 BLAKE2B f04df366ee3e47921f5635472ac22412066d3d97e0f4d2627993b1b6173321687a575abc8700907a9c63829704792505681196e0786e7dc39b9ecbab7562ef9e SHA512 967ad7fdb3503c2dc37df79ba9f45ed7627a5b8e287cae9e8963a259a6568282c16d509e873c7d8b97e4acaafbd71dcec00e5ac71ed695b20ecddca5da20ba96
+DIST python-mode.el-6.2.0.tar.gz 393046 BLAKE2B bc1327324a0b4d2e35cdb4ee593ca6ae5ef203dcea3312e3f24690ce90780c50f4a60e17d9ff32730e5a0dcef9cb04af2150211fc23fe620a4e265d335115616 SHA512 0280649fa646e071a756a657be91dc3b4ab0a227105eeba7601b98fbac1916af0607add20c58c74434eb2fa139a996736e963783b1500ca6f3656a90deaa427e
+DIST python-mode.el-6.2.3.tar.gz 314461 BLAKE2B 3bd71b47de1284d59db61f829e3419f2fb10e226900392d903256f31ad90f47317b7bde4cde1cf7d86518f9c706d9c844b208a9e2469a41037252a63f7bc1ba6 SHA512 4aeb33d4054d582cd2a3f4834472c7d0cb3fe5e12e10f5117dcbcd90ec2ca490964c774918c83697f283c68e57766c3c67d3853ddbaa3408777fdafc7f2674f2
+EBUILD python-mode-6.1.2.ebuild 699 BLAKE2B 76795f546f74f975f8b86a634c70a2da4a1f09e474f3a71cf7b9159422a3b89a942dfd194d412157ba04996aae2b09ffc1a04621998c22ce5d5519c257d7d59f SHA512 dde848988b0803e4633d8173d53d05832d828e3416b87b1bbf564dabafaf45325ef55ca8d01ac7b388f490540af769f227c866956ad8a374bf8779422481ab77
+EBUILD python-mode-6.2.0.ebuild 706 BLAKE2B 05c0d372660816f6100a035935b9bb06e31f7dd47971a7531edad67e4a8dabacd186f0287c683a3308f02c97725897aff268ee399dea4a9c0f5b75053956a1b5 SHA512 c4543e850baf72e29c2883419426de594c8242e045648efc95634e5a5f4eb2f05ee60ffa967c80fbf01b2e22b9e9cf6f2697c72f923bea774d4445460c0b8f9a
+EBUILD python-mode-6.2.3.ebuild 719 BLAKE2B be6cd202cb097f5d230c9d99a330780606907433a3611c3a312c442906bc0f6d6e97c51bfd3c7f23e9a2c5bc992df173747115a5268e3b1416c60afa5f60d913 SHA512 47e540de2df830173e051a05baeb89ac44ea2b828e3719106f3cac14c3bcdc36ae5b9731d93e64470a249aadf18e431c984cc76c1202e691cc9a832eabcf17f4
+MISC metadata.xml 359 BLAKE2B 6f98624b4484b28ec87e9d4de4ae43b729db5c5c76bf9e480f86eca25423e8cc8a201762b8f938b5b012765e9258d1752fe01a847e3cd69539aa25ba0cdf9394 SHA512 a61b3fe8afa6c99edce3978dac6b52f37be06c7fbd57166697d14e9d4d0b5e7212c3bb1988c47aeeff4356cd841ca20a4605da0b5bed487acca4e2375994b0bb
diff --git a/app-emacs/python-mode/files/50python-mode-gentoo.el b/app-emacs/python-mode/files/50python-mode-gentoo.el
new file mode 100644
index 000000000000..75812316482a
--- /dev/null
+++ b/app-emacs/python-mode/files/50python-mode-gentoo.el
@@ -0,0 +1,11 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'python-mode "python-mode" "Major mode for editing Python files." t)
+(autoload 'jython-mode "python-mode" "Major mode for editing Jython files." t)
+(autoload 'py-shell "python-mode"
+ "Start an interactive Python interpreter in another window." t)
+
+(add-to-list 'auto-mode-alist '("\\.py$" . python-mode))
+(add-to-list 'auto-mode-alist '("\\.pyx$" . python-mode))
+(add-to-list 'interpreter-mode-alist '("python" . python-mode))
+(add-to-list 'interpreter-mode-alist '("jython" . jython-mode))
diff --git a/app-emacs/python-mode/metadata.xml b/app-emacs/python-mode/metadata.xml
new file mode 100644
index 000000000000..10e3ec753fc8
--- /dev/null
+++ b/app-emacs/python-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="launchpad">python-mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/python-mode/python-mode-6.1.2.ebuild b/app-emacs/python-mode/python-mode-6.1.2.ebuild
new file mode 100644
index 000000000000..8097ab2a511b
--- /dev/null
+++ b/app-emacs/python-mode/python-mode-6.1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+MY_P="${PN}.el-${PV}"
+DESCRIPTION="An Emacs major mode for editing Python source"
+HOMEPAGE="https://launchpad.net/python-mode"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="NEWS README"
+DOC_CONTENTS="Note that doctest and pymacs are in their own packages,
+ app-emacs/doctest-mode and app-emacs/pymacs, respectively."
diff --git a/app-emacs/python-mode/python-mode-6.2.0.ebuild b/app-emacs/python-mode/python-mode-6.2.0.ebuild
new file mode 100644
index 000000000000..089fa115e867
--- /dev/null
+++ b/app-emacs/python-mode/python-mode-6.2.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+MY_P="${PN}.el-${PV}"
+DESCRIPTION="An Emacs major mode for editing Python source"
+HOMEPAGE="https://launchpad.net/python-mode"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="NEWS README"
+DOC_CONTENTS="Note that doctest and pymacs are in their own packages,
+ app-emacs/doctest-mode and app-emacs/pymacs, respectively."
diff --git a/app-emacs/python-mode/python-mode-6.2.3.ebuild b/app-emacs/python-mode/python-mode-6.2.3.ebuild
new file mode 100644
index 000000000000..b9e0840ac956
--- /dev/null
+++ b/app-emacs/python-mode/python-mode-6.2.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp readme.gentoo-r1
+
+MY_P="${PN}.el-${PV}"
+DESCRIPTION="An Emacs major mode for editing Python source"
+HOMEPAGE="https://launchpad.net/python-mode"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="NEWS README_DEVEL.org"
+DOC_CONTENTS="Note that doctest and pymacs are in their own packages,
+ app-emacs/doctest-mode and app-emacs/pymacs, respectively."
diff --git a/app-emacs/quack-0.47 b/app-emacs/quack-0.47
deleted file mode 100644
index 7f822d014280..000000000000
--- a/app-emacs/quack-0.47
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Enhances Emacs support for Scheme
-EAPI=5
-HOMEPAGE=http://www.neilvandyke.org/quack/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/quack-0.47.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=85e99630f660b1f2cf6368fe718b404b
diff --git a/app-emacs/quack/Manifest b/app-emacs/quack/Manifest
new file mode 100644
index 000000000000..98354b0d2188
--- /dev/null
+++ b/app-emacs/quack/Manifest
@@ -0,0 +1,4 @@
+AUX 50quack-gentoo.el 443 BLAKE2B 54f22bb597de98c092a0f520f0da43ecb1c0b3775aa49058c6210116f0cb9a4820a4b29703e1b64cb6975984b3c5be596b5d94efbd0639c67208e864ec37e49f SHA512 724a1903e7c801e59af487059373225ab5c9da02bb912364566dcd468f06067aa722061bb5e1c9284cfae200538550d3e5fbee24de997720f47af4cae10f90d7
+DIST quack-0.47.el.xz 44508 BLAKE2B 36b05926e019d191a21bac6e8e0d8f2c0228a4decee807f3ed61b145db56af5bdede43708c5e04d1f65f261b7de645a40a02a95f0300b8673b454293011903e9 SHA512 41775f5850518a8738aae9d7185c733ad4d5a778859a9d9a7235c84184fb7b84dd49d37a607291f39fac4ddc1cd507806a01dd19ab3351646ecf35e747feb8ce
+EBUILD quack-0.47.ebuild 368 BLAKE2B 5e126718546977ff957d913e5bd7956955cf6fab08ca976074350ce176a044c462c796c39ac06e855a032ca680fa0d94e8fdc61f9fcd477cd2a81f3489bbd0c0 SHA512 8d41f0d20afb492fcf9dc8814e5ec5970ac199422728a4d27da3918a226f424ef0f2845fdd89c62113f63a3d68a1096eb8da5828a8746c5606a2575cc667f176
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/quack/files/50quack-gentoo.el b/app-emacs/quack/files/50quack-gentoo.el
new file mode 100644
index 000000000000..22cca093d956
--- /dev/null
+++ b/app-emacs/quack/files/50quack-gentoo.el
@@ -0,0 +1,10 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'quack-scheme-mode-hookfunc "quack")
+(autoload 'quack-inferior-scheme-mode-hookfunc "quack")
+(autoload 'quack-pltfile-mode "quack"
+ "Major mode for viewing PLT Scheme `.plt' package files." t)
+
+(add-hook 'scheme-mode-hook 'quack-scheme-mode-hookfunc)
+(add-hook 'inferior-scheme-mode-hook 'quack-inferior-scheme-mode-hookfunc)
+(add-to-list 'auto-mode-alist '("\\.plt\\'" . quack-pltfile-mode))
diff --git a/app-emacs/quack/metadata.xml b/app-emacs/quack/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/quack/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/quack/quack-0.47.ebuild b/app-emacs/quack/quack-0.47.ebuild
new file mode 100644
index 000000000000..2cae951f4432
--- /dev/null
+++ b/app-emacs/quack/quack-0.47.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Enhances Emacs support for Scheme"
+HOMEPAGE="http://www.neilvandyke.org/quack/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/quilt-el-0.48.0 b/app-emacs/quilt-el-0.48.0
deleted file mode 100644
index 637e8913a299..000000000000
--- a/app-emacs/quilt-el-0.48.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Quilt mode for Emacs
-EAPI=5
-HOMEPAGE=http://satoru-takeuchi.org/dev/quilt-el/
-KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86
-LICENSE=GPL-1+
-RDEPEND=dev-util/quilt >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://satoru-takeuchi.org/dev/quilt-el/download/quilt-el-0.48.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=782ff3365f43f511c6dda3a57eaba466
diff --git a/app-emacs/quilt-el/Manifest b/app-emacs/quilt-el/Manifest
new file mode 100644
index 000000000000..6017bf525ef0
--- /dev/null
+++ b/app-emacs/quilt-el/Manifest
@@ -0,0 +1,6 @@
+AUX 50quilt-el-gentoo.el 295 BLAKE2B 2179c4c7635fc79dcfc5444f37c2c38d35468a9c11742f3a162f78dc49c33abe605cb68642b858b0ff6221180f74555f0f5a5833740e757aadd0ad903325de49 SHA512 b14f5b3db3ec93cdb0b95b64295dd5d7d6561db4b71ee691001cab5678922dd2977716f023c8b046e63e2ff6dcc25d5f5dd1dce9571016ac16c86b44529d9417
+AUX quilt-el-0.45.4-header-window.patch 297 BLAKE2B 87d5157dcf03d8975afd0b72d223c2a2133039aecafd9f283ec2729e440fee56719d1ca02be7565c22bc3e1c887ac57677dd771ed4b4d11681e1d21315036bc3 SHA512 fe12a4a4326bf586441b838dbc52bf8bd32fe639208ce5078627f24f13a5e49547ac1361117f8fc9578689d1b953ba2724981b9e563ab14192cdc1d78c59fff5
+AUX quilt-el-0.48.0-tramp-recursion.patch 363 BLAKE2B ca26afa6738d51efd007d46ffb78414d4ae296626905db1ca6b65b09d8946f1e09536a04f4153650763478f4054f07a8dc58e171ed4e613d1a259afcf4214fb1 SHA512 b4369142d70543bbb8139b4f6d8b8c8c13bf2bbd93d1bc87de690c93de485d9000918c6fe7278a32472b2a9afb495f3a9c639434a3edd3489c6cf2bd5f99a5fe
+DIST quilt-el-0.48.0.tar.gz 13147 BLAKE2B 595e7d12c24095df3c0d12de607b4e43e36345b53f9d89e6ea6ea781ed25f893d5100e3a023b4f5bc0aee11dcf93a7ef3862fabe28c8eda98a43dce634969444 SHA512 0a198ef0f8354c927c4527bb7a3e99fd6d12f17cbe65c736341c527de440d144581205337163912ce04f83749c31833221cc4153d5736ffec060ad4ade73c694
+EBUILD quilt-el-0.48.0.ebuild 524 BLAKE2B c09278c3efca977158d8a323911947439c3a7812b2b82d2f4418666c91cf3a56d3febf3e1587c72a602f7fe361233387991c7dfbfa51311b57400085dc190067 SHA512 f9a65f053573d5f561b82728701b09588aa87e42114da625abbacfa53a49d001113a04b122de67b7cc39a295bab9efcab3597d95329826ef1509fdd85e11a879
+MISC metadata.xml 657 BLAKE2B f42a9f750c0914dae5ebf3cf8798857d8bb2b8135597470991dfe3e3644716e47d3079d77754305be689a337609e719ba277e5e0a4119bed5e2ae2272147bebd SHA512 d7e9d85957ad96345d3394977312e5ffbb37c61f7529b7b179c2dfcb1e41208089a469fc5db8760f0f62a6cdb5ddf801e11673d126711569fc2a61bfd8a04e4b
diff --git a/app-emacs/quilt-el/files/50quilt-el-gentoo.el b/app-emacs/quilt-el/files/50quilt-el-gentoo.el
new file mode 100644
index 000000000000..ccdd69d19ab9
--- /dev/null
+++ b/app-emacs/quilt-el/files/50quilt-el-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'quilt-mode "quilt"
+ "Toggle quilt-mode. With positive arg, enable quilt-mode." t)
+(autoload 'quilt-hook "quilt"
+ "Enable quilt mode for quilt-controlled files.")
+(add-hook 'find-file-hooks 'quilt-hook)
+(add-hook 'after-revert-hook 'quilt-hook)
diff --git a/app-emacs/quilt-el/files/quilt-el-0.45.4-header-window.patch b/app-emacs/quilt-el/files/quilt-el-0.45.4-header-window.patch
new file mode 100644
index 000000000000..b2f532617f76
--- /dev/null
+++ b/app-emacs/quilt-el/files/quilt-el-0.45.4-header-window.patch
@@ -0,0 +1,10 @@
+--- quilt-el.orig/quilt.el
++++ quilt-el/quilt.el
+@@ -399,6 +399,7 @@
+ (cd quilt-header-directory)
+ (shell-command (concat "EDITOR=cat quilt -r header <" tmp))
+ (kill-buffer (current-buffer))
++ (delete-window)
+ (delete-file tmp)))
+
+ (defvar quilt-header-mode-map (make-keymap))
diff --git a/app-emacs/quilt-el/files/quilt-el-0.48.0-tramp-recursion.patch b/app-emacs/quilt-el/files/quilt-el-0.48.0-tramp-recursion.patch
new file mode 100644
index 000000000000..aa1bf5c97e8d
--- /dev/null
+++ b/app-emacs/quilt-el/files/quilt-el-0.48.0-tramp-recursion.patch
@@ -0,0 +1,11 @@
+--- quilt-el-0.48.0-orig/quilt.el
++++ quilt-el-0.48.0/quilt.el
+@@ -49,7 +49,7 @@
+
+ (defun quilt-find-dir (fn)
+ "Return the top level dir of quilt from FN."
+- (if (or (not fn) (equal fn "/"))
++ (if (or (not fn) (equal fn (file-name-directory fn)))
+ nil
+ (let ((d (file-name-directory fn)))
+ (if (file-accessible-directory-p (concat d "/.pc"))
diff --git a/app-emacs/quilt-el/metadata.xml b/app-emacs/quilt-el/metadata.xml
new file mode 100644
index 000000000000..a1854035455f
--- /dev/null
+++ b/app-emacs/quilt-el/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ quilt-el is an Emacs minor mode for quilt. By using this, it becomes easy to
+ edit files controlled by quilt. The main features are as follows:
+ * Automatically detects files that are in a quilt hierarchy and enables
+ itself.
+ * Only files in topmost patch can be writable.
+ * Some handy shortcut keys of quilt commands.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/quilt-el/quilt-el-0.48.0.ebuild b/app-emacs/quilt-el/quilt-el-0.48.0.ebuild
new file mode 100644
index 000000000000..3cbadd1d144d
--- /dev/null
+++ b/app-emacs/quilt-el/quilt-el-0.48.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp eutils
+
+DESCRIPTION="Quilt mode for Emacs"
+HOMEPAGE="http://satoru-takeuchi.org/dev/quilt-el/"
+SRC_URI="http://satoru-takeuchi.org/dev/${PN}/download/${P}.tar.gz"
+
+LICENSE="GPL-1+"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
+
+RDEPEND="dev-util/quilt"
+
+ELISP_PATCHES="${P}-tramp-recursion.patch
+ ${PN}-0.45.4-header-window.patch"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README changelog"
diff --git a/app-emacs/qwerty-1.1 b/app-emacs/qwerty-1.1
deleted file mode 100644
index bec802616b37..000000000000
--- a/app-emacs/qwerty-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Switch between QWERTY and DVORAK without changing the console keymap
-EAPI=5
-HOMEPAGE=https://groups.google.com/group/gnu.emacs.sources/msg/eab31c752dfdd3a5
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-1+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/qwerty-1.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=cf1594a28e7122d83a56e40de3a71b7e
diff --git a/app-emacs/qwerty/Manifest b/app-emacs/qwerty/Manifest
new file mode 100644
index 000000000000..38085b317aec
--- /dev/null
+++ b/app-emacs/qwerty/Manifest
@@ -0,0 +1,4 @@
+AUX 50qwerty-gentoo.el 140 BLAKE2B 70da306ec10d8b893ea3f57369aacfa941e080263dba3cc4daf6c8f9b8cefcfbd9729b8f2a41f5c61f8b864f4e5b8782ecd90f4e9013ff18c495d953a73628b1 SHA512 5b4b0c39324d68769698a83000e7c291a685f3b0c0118ef238557674d56075df45714aab28c662bcc5e487ae1438639ab310bb21c1b6def7aa617aa6ac406c82
+DIST qwerty-1.1.tar.gz 3629 BLAKE2B 593103d464f0745fc1d0ebb5268eb3ef9e67fc0ef59c10bc5975e8c4f512afc705ba1867975c91fb48c70ab4d32690f16ab13eaad16f577e1ecf5af4038a1320 SHA512 1e808f758c2db054a1ae9fbfd961a1ca279226738d2cfcfc640e1613814469320dba75a2b6be00641403ce165e0fd02da04b791928979506deb8ef98cb9b9ada
+EBUILD qwerty-1.1.ebuild 490 BLAKE2B 13d46784982ec1042d9c95f56ba5e1446b1cb6e0447919783c5548ecbff0f747cafa287b898d81c8401e4939003c934c2a011b17d2475c6444ec318274e55e10 SHA512 6291187b54b954326a363ee00da0e4750e3d49aea848f47d5b179140e328af2a10c1663e6830887ae070b6c2de8a7ae9aa4a538c471ce8ba80321e389ca87c1d
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/qwerty/files/50qwerty-gentoo.el b/app-emacs/qwerty/files/50qwerty-gentoo.el
new file mode 100644
index 000000000000..20580cfc7c11
--- /dev/null
+++ b/app-emacs/qwerty/files/50qwerty-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'qwerty "qwerty"
+ "Switch between QWERTY and DVORAK without changing the system keymap" t)
diff --git a/app-emacs/qwerty/metadata.xml b/app-emacs/qwerty/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/qwerty/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/qwerty/qwerty-1.1.ebuild b/app-emacs/qwerty/qwerty-1.1.ebuild
new file mode 100644
index 000000000000..0beecc1db337
--- /dev/null
+++ b/app-emacs/qwerty/qwerty-1.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Switch between QWERTY and DVORAK without changing the console keymap"
+# gnu.emacs.sources Message-ID: <NJ104.93Mar1125218@bootes.cus.cam.ac.uk>
+HOMEPAGE="https://groups.google.com/group/gnu.emacs.sources/msg/eab31c752dfdd3a5"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-1+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/redo+-1.19 b/app-emacs/redo+-1.19
deleted file mode 100644
index 692f4877f054..000000000000
--- a/app-emacs/redo+-1.19
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Redo/undo system for Emacs
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/RedoPlus https://www11.atwiki.jp/s-irie/pages/18.html
-KEYWORDS=alpha amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/redo+-1.19.el.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4607c67d0fb787a12a6812c76da2aa7a
diff --git a/app-emacs/redo+/Manifest b/app-emacs/redo+/Manifest
new file mode 100644
index 000000000000..f7264bfe4bf0
--- /dev/null
+++ b/app-emacs/redo+/Manifest
@@ -0,0 +1,4 @@
+AUX 50redo+-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST redo+-1.19.el.xz 4160 BLAKE2B e595fa0c5dc7d2b7da5bef77815b9c6bfe1372db37a2b7dbf6d3c84e7b8243fa9003f6c76d1175df2805a72fd9eab3c1f0245b42435cd3513311fc708d9cb7eb SHA512 e6e436b3e11d90b637e66328f2f1bfeffe0c7fe4e4f1778825e95cdb2bdf934797e9ed5563f8d83bef4fcdbf5fa4f4ab4d85bcd35b967615fdd5bce45ba39d95
+EBUILD redo+-1.19.ebuild 575 BLAKE2B a188c843497c70123291b5d9d8f97e6c8cf3402dd78df2641d6cb1b917e19fded1960c2a83347bdc91342ab7dfd3149c47de882f83336070acec89af63744524 SHA512 e5009eb1d0191e298b56ac6a2cb2f8a358eee473ea76604f50a2df0de118b806db05d89ed993d8be26bfbf6679f0d8e4529dcbe9218c6a2a52bc7abf875f4924
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/redo+/files/50redo+-gentoo.el b/app-emacs/redo+/files/50redo+-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/redo+/files/50redo+-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/redo+/metadata.xml b/app-emacs/redo+/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/redo+/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/redo+/redo+-1.19.ebuild b/app-emacs/redo+/redo+-1.19.ebuild
new file mode 100644
index 000000000000..2a45fa52a8b4
--- /dev/null
+++ b/app-emacs/redo+/redo+-1.19.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+DESCRIPTION="Redo/undo system for Emacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/RedoPlus
+ https://www11.atwiki.jp/s-irie/pages/18.html"
+# taken from http://www.emacswiki.org/emacs/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="Add \"(require 'redo+)\" to your ~/.emacs file
+ to enable the redo/undo system."
diff --git a/app-emacs/regress-1.5.1 b/app-emacs/regress-1.5.1
deleted file mode 100644
index c2c4d29db643..000000000000
--- a/app-emacs/regress-1.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Regression test harness for Emacs Lisp code
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/WikifiedEmacsLispList
-KEYWORDS=alpha amd64 ppc x86
-LICENSE=GPL-1+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/regress-1.5.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=d889dd47b1a8158484c80b2393b0af51
diff --git a/app-emacs/regress/Manifest b/app-emacs/regress/Manifest
new file mode 100644
index 000000000000..218e14a41e6d
--- /dev/null
+++ b/app-emacs/regress/Manifest
@@ -0,0 +1,5 @@
+AUX 1.5.1-regress.el-gentoo.patch 444 BLAKE2B 1ea48b62e5c85ee52db6561603d3301f284f76fe276c33933229185829b703b71af0e7603be0537f84a2f54851d5eca0a1f066b588123dae7eaaea0b0d354a7c SHA512 e8ab5b3163dd8ff3aba0e3d8032e1f76fbb4c456fca254ff7018c01acd0c56fda880fcf68a8e974f97e009d331b3bfc833d820b936e8149a7ca5e877114ad1ab
+AUX 50regress-gentoo.el 214 BLAKE2B 45b67c27b25470c8e47c155fbe3677aa9f9c5b9ff297a2876dd9dd95808afb5bbc1eef4ffa8ed337517a0245d45e89aebb822ba38bb58d39911e5adb79e1f6fc SHA512 8d007e54dd017076cd061c0c05e0e935fe70f07b99e36e52df09d3d84d4a67b15b39d8076011c8ab25bb5e2803ceacd2b9b43ca246743e82f189cb3bff4565a6
+DIST regress-1.5.1.tar.gz 8633 BLAKE2B c399da64c802d261690bc7d513d9ca1dc5a1c76968273f50f933cd6ae8e04ec716ad4b1b7e598a7983ce8fb77daae3d21eb24f3c80629dfbbb2df5415f2ad756 SHA512 8718d44fc8cd62b9f02f53e59b0843f23cd9f1852c8f3c3038a3009b72f65efff94ac0fa9a18356d5efe7dde593e4643ed17fb54b5cc602f60c730cbb5cbd64a
+EBUILD regress-1.5.1.ebuild 426 BLAKE2B bbcd5bdcd909af900fd4558bab914e1e5aed90548d9f04d92e476c14b37df4c7722d1f7101c4841ef46df87e444f85b10d50be8d78b5f923f93d0457fcc3f73b SHA512 4b0a0dd228a3cc0ae587bdcc936b48ac118e605ee4643744531ee3c907a0cbf91f444419a616e9677ea6219901254c8e1a28fa9bff2200c23e1c1791d088e323
+MISC metadata.xml 416 BLAKE2B 3bb442d03770fede34325529936b2d8e07650d32c93d7b05ac8f9baebf448cf1cce9c429789023bc1c4668b31e4b74fedb2c444061a35cbf86a01ec90439f9af SHA512 a3c131341e620213b25a49d9dd4d3ac018945321c65fa7890028c817f97403f1a1902f1b50d12ee8e1c36393c8ef48841c24f263f1eb6ac6934407efb5db6140
diff --git a/app-emacs/regress/files/1.5.1-regress.el-gentoo.patch b/app-emacs/regress/files/1.5.1-regress.el-gentoo.patch
new file mode 100644
index 000000000000..a66081ed759c
--- /dev/null
+++ b/app-emacs/regress/files/1.5.1-regress.el-gentoo.patch
@@ -0,0 +1,11 @@
+--- regress-1.5.1.orig/regress.el 2005-06-29 12:53:39.000000000 -0500
++++ regress-1.5.1/regress.el 2005-06-30 10:11:38.000000000 -0500
+@@ -114,6 +114,8 @@
+ ;; regression test fails and FAILURE-INDICATION is non-nil, it will
+ ;; be printed along with the results.
+
++(eval-when-compile
++ (require 'cl))
+
+ ;; Here are some contrived, simple examples. Much of regress.el
+ ;; itself contains regression tests. Search for "eval-when-compile",
diff --git a/app-emacs/regress/files/50regress-gentoo.el b/app-emacs/regress/files/50regress-gentoo.el
new file mode 100644
index 000000000000..307bf13f1477
--- /dev/null
+++ b/app-emacs/regress/files/50regress-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'regress-insert-suite "regress" nil t)
+(autoload 'regress-insert-call "regress" nil t)
+(autoload 'regress-forget "regress" nil t)
+(autoload 'regress "regress" nil t)
diff --git a/app-emacs/regress/metadata.xml b/app-emacs/regress/metadata.xml
new file mode 100644
index 000000000000..7658bf99b319
--- /dev/null
+++ b/app-emacs/regress/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ This module provides support for writing and executing regression
+ tests for Emacs Lisp code.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/regress/regress-1.5.1.ebuild b/app-emacs/regress/regress-1.5.1.ebuild
new file mode 100644
index 000000000000..bcaf45eae24b
--- /dev/null
+++ b/app-emacs/regress/regress-1.5.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Regression test harness for Emacs Lisp code"
+HOMEPAGE="https://www.emacswiki.org/emacs/WikifiedEmacsLispList"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-1+"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc x86"
+
+ELISP_PATCHES="${PV}-regress.el-gentoo.patch"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/remember-2.0 b/app-emacs/remember-2.0
deleted file mode 100644
index 164c3ca0e6fc..000000000000
--- a/app-emacs/remember-2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=bbdb? ( app-emacs/bbdb ) planner? ( app-emacs/planner ) sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=Simplify writing short notes in emacs
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/RememberMode
-IUSE=bbdb planner
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3+ FDL-1.2+
-RDEPEND=bbdb? ( app-emacs/bbdb ) planner? ( app-emacs/planner ) >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.gna.org/remember-el/remember-2.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=65e6a3d8d3467b646ddd8e0f83464b42
diff --git a/app-emacs/remember/Manifest b/app-emacs/remember/Manifest
new file mode 100644
index 000000000000..f1d294ce6545
--- /dev/null
+++ b/app-emacs/remember/Manifest
@@ -0,0 +1,5 @@
+AUX 50remember-gentoo.el 376 BLAKE2B 1dd3ebb7584b0a98c3897ad3e6b7cdaa2f7ca27099c82eb42c5a9fe44bc1dfb60bcb4a19d16b452722dc72e29f5718ea6ca952f65ed699190e3e9b9ec0b3c948 SHA512 b1424526d7ae0fdea157a123a2030ff47700addbdec3c6d8ae42b0587e3eb028c54cf27a3d5b9298fbac04b4e3216fec0d189df29d3c4076fcaeb64cd9b1edd6
+AUX remember-1.9-make-elc.patch 320 BLAKE2B 65d0f4a1df9b7bbf09ad39830fc20faefd4fd554783758139c4351ce64e4444bc8884f7fe3c4e6a46b029c3543418c24ec050485d079049f8e9e2cf9a5726b82 SHA512 1050d5dea089a7732d8310f6131c2d95037cdc98150ef8cc6113a5a31c16cf0fd730a0d11ff6f3909ad1835419a47e384cc490f529ef38a5b000b6f27bc6112e
+DIST remember-2.0.tar.gz 48096 BLAKE2B 7296760b561ab3c626a4c356aeaf02f9783d0ce84fb2e1bfbcfd46f392a5128bc956e378f646394645589ca6dd2a9bf1ff364ade25787ffa58f580d4decc485f SHA512 c5d1a55904699565af6375d19e88924a31364cf6f9b09b6e5510ac3e65c9bddbb2e0a5aa668dfd6e541ea6572209cad8af68694b7376b1bfe964032d247e5e01
+EBUILD remember-2.0.ebuild 872 BLAKE2B 4bf3450e5fab7cc1794bfcdbb62747d909ed3a43c9f232c39dd08e0baacf8efdd2d83b442dba8cbc9d19af0f7d1199f4ef6154105fb9383f08a2f381f758528d SHA512 0ca05efbc9508dfc2eae5f289f5f465233e9837cca748025781167092adfd54704c3fbf7c5cef7962819daef571afbd651c8ab3d55b02f4533667041e01b45e0
+MISC metadata.xml 1020 BLAKE2B 1c7bb59785a3080176b41fe4e9826dcf0c9da4ed474c5e69cfef275fa23793303020208b3e79cec7f57f3b5eb9adc66ccad47a7469068dc77ce2e63b03587ace SHA512 c5a9fdd17e4b5fa4822cc5f6e694667fffd5e29ee44a965657e4ef5b9db819efaa29c74ebf0defcd62c70ad2d1019953a23492cb1b67947e82a5458bfb55ac73
diff --git a/app-emacs/remember/files/50remember-gentoo.el b/app-emacs/remember/files/50remember-gentoo.el
new file mode 100644
index 000000000000..d12bde7b24b1
--- /dev/null
+++ b/app-emacs/remember/files/50remember-gentoo.el
@@ -0,0 +1,8 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'remember "remember" "Remember an arbitrary piece of data." t)
+(autoload 'remember-region "remember" "Remember the data from BEG to END." t)
+(autoload 'remember-clipboard "remember"
+ "Remember the contents of the current clipboard." t)
+(autoload 'remember-buffer "remember"
+ "Remember the contents of the current buffer." t)
diff --git a/app-emacs/remember/files/remember-1.9-make-elc.patch b/app-emacs/remember/files/remember-1.9-make-elc.patch
new file mode 100644
index 000000000000..fb0bf1beb57d
--- /dev/null
+++ b/app-emacs/remember/files/remember-1.9-make-elc.patch
@@ -0,0 +1,11 @@
+--- remember-1.9/Makefile~ 2006-08-06 03:38:34.000000000 +0200
++++ remember-1.9/Makefile 2007-06-25 07:13:22.000000000 +0200
+@@ -21,7 +21,7 @@
+
+ %.elc: %.el
+ @$(EMACS) -q $(SITEFLAG) -batch -l ./scripts/$(PROJECT)-build.el \
+- -f batch-byte-compile $< || :
++ -f batch-byte-compile $<
+
+ %.info: %.texi
+ makeinfo $<
diff --git a/app-emacs/remember/metadata.xml b/app-emacs/remember/metadata.xml
new file mode 100644
index 000000000000..598d1ac6cbb5
--- /dev/null
+++ b/app-emacs/remember/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ 'Remember' is a mode for remembering data. It uses whatever back-end is
+ appropriate to record and correlate the data, but its main intention is to
+ allow you to express as little structure as possible up front. If you later
+ want to express more powerful relationships between your data, or state
+ assumptions that were at first too implicit to be recognized, you can
+ 'study' the data later and rearrange it. But the initial 'just remember
+ this' impulse should be as close to simply throwing the data at Emacs as
+ possible.
+</longdescription>
+<stabilize-allarches/>
+<use>
+ <flag name="bbdb">Include support for <pkg>app-emacs/bbdb</pkg></flag>
+ <flag name="planner">Include support for <pkg>app-emacs/planner</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/app-emacs/remember/remember-2.0.ebuild b/app-emacs/remember/remember-2.0.ebuild
new file mode 100644
index 000000000000..3774e1a0f620
--- /dev/null
+++ b/app-emacs/remember/remember-2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Simplify writing short notes in emacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/RememberMode"
+SRC_URI="http://download.gna.org/${PN}-el/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="bbdb planner"
+# tests require bibl-mode, restrict for now
+RESTRICT="test"
+
+RDEPEND="bbdb? ( app-emacs/bbdb )
+ planner? ( app-emacs/planner )"
+DEPEND="${RDEPEND}
+ sys-apps/texinfo"
+
+ELISP_PATCHES="${PN}-1.9-make-elc.patch"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="remember.texi remember-extra.texi"
+DOCS="ChangeLog* NEWS"
+
+src_compile() {
+ local EL="remember.el read-file-name.el"
+ use bbdb && EL+=" remember-bbdb.el"
+ use planner && EL+=" remember-planner.el remember-experimental.el"
+ emake EL="${EL}"
+}
diff --git a/app-emacs/revive-2.23 b/app-emacs/revive-2.23
deleted file mode 100644
index 9b525c75ad5e..000000000000
--- a/app-emacs/revive-2.23
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Resume Emacs
-EAPI=6
-HOMEPAGE=http://www.gentei.org/~yuuji/software/
-KEYWORDS=~amd64
-LICENSE=yuuji
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/gavv/distfiles/raw/master/revive-2.23.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=98b19388c02e94f02e99f204863785b8
diff --git a/app-emacs/revive/Manifest b/app-emacs/revive/Manifest
new file mode 100644
index 000000000000..b97cf6d9174b
--- /dev/null
+++ b/app-emacs/revive/Manifest
@@ -0,0 +1,4 @@
+AUX 50revive-gentoo.el 70 BLAKE2B 9f95d0e1817cdded2bb5c4033ab5e0d85dac569150691534a0c0f7ce9ae484a51523a97f27870106d6867e8ff0e6f6ce7e1454b62956478b170cdd8de704c11c SHA512 500ca2eb2c81fdf53a3f169885631b835d46bb6aabc640c337a99d6f5cd33b512e76940a9e80c7ba8cb06591ba395db9c2195532a2e9d4b2767a163727d6584e
+DIST revive-2.23.el.xz 9960 BLAKE2B c5955137e7f152691b5dde888536a61dcf2b1ceb3045da9ba861f2b10d467942d3581ca706a9041f7c9bf7092a88f7fe4b6fd8f1dc19ed303350f1bf581439cb SHA512 6eccd93e217bdb6d6f78b95c5b620f069c70e87deb5d9ddfdb30c01edafd1ea123eb9d2943e0143062e8db4423cf30bf9028e51cbb1519e67e9210b2dc282128
+EBUILD revive-2.23.ebuild 478 BLAKE2B d4a540a8bab90904d91bab0c00c64ca31efc678de28a6425f0d55d8254cedd4b5ec12f9eb4174787da25b1228d6ac3de4c3329eb8d0459f9a4e3fec814a57c05 SHA512 11f7581b2b7ed57e551198478b5a2bc7074a8ace16847de6e1614322452e4bac4403ffba4bf8ee0050051b9a50223664a18e95a6191d16a950821bacead77620
+MISC metadata.xml 292 BLAKE2B 046265ce3ff94f04bba9b4b344d852203657df8dd300f30620df260bad1c56b3c23a8c48d073f70f571f733af9a7c034922e0465878028ee8f748060a6816ec6 SHA512 f0115ae686d3003f4264968d3aeb0b054830f87f35378e15e205a729d591c8697507d3c76ead9e1f0bab1f1f66a3fda108322dbcec7b857a37000511d1dd17df
diff --git a/app-emacs/revive/files/50revive-gentoo.el b/app-emacs/revive/files/50revive-gentoo.el
new file mode 100644
index 000000000000..f51bc40b6fa4
--- /dev/null
+++ b/app-emacs/revive/files/50revive-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "revive-autoloads" nil t)
diff --git a/app-emacs/revive/metadata.xml b/app-emacs/revive/metadata.xml
new file mode 100644
index 000000000000..c6a53b949e75
--- /dev/null
+++ b/app-emacs/revive/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/revive/revive-2.23.ebuild b/app-emacs/revive/revive-2.23.ebuild
new file mode 100644
index 000000000000..056dfc59711b
--- /dev/null
+++ b/app-emacs/revive/revive-2.23.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Resume Emacs"
+HOMEPAGE="http://www.gentei.org/~yuuji/software/"
+# taken from http://www.gentei.org/~yuuji/software/euc/revive.el
+SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
+
+LICENSE="yuuji"
+SLOT="0"
+KEYWORDS="~amd64"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile *.el
+ elisp-make-autoload-file
+}
diff --git a/app-emacs/rfcview-0.13 b/app-emacs/rfcview-0.13
deleted file mode 100644
index a040dfde89b0..000000000000
--- a/app-emacs/rfcview-0.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Emacs mode that reformats IETF RFCs for display
-EAPI=5
-HOMEPAGE=http://www.loveshack.ukfsn.org/emacs/ https://www.emacswiki.org/emacs/RfcView
-KEYWORDS=alpha amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rfcview-0.13.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=cb897fba3f1eda6e19a81cb4dcf3ae15
diff --git a/app-emacs/rfcview/Manifest b/app-emacs/rfcview/Manifest
new file mode 100644
index 000000000000..0db6ae6a5cf1
--- /dev/null
+++ b/app-emacs/rfcview/Manifest
@@ -0,0 +1,4 @@
+AUX 50rfcview-gentoo.el 168 BLAKE2B 8cb9470bb4d06caaf5345344d3b2608d47cbe8ac9a1ed325528c84b05db696577e6b332993207aaa4d485c303caab3a67bf866457aaa270c6e28a5e0f38d7303 SHA512 ed6bec3e4368d4d7e193c5b6ee0493d6c497bce90ec834376371898777a7c3601288bda59232c1ec4920ca20bbcdf4d01ae3d2ea617da55a31568a5824179637
+DIST rfcview-0.13.el.xz 8836 BLAKE2B a71f7bfcee9170330f30b7087e37723fff1081b146141d26d1c0ae60a98060a069f4018ff252808dbe27b4d5d78d053da36a420657ba137b91d37820d055cfa3 SHA512 84cda45b5e941808e2ddc50d5f03d7b2d3831208d08dddd2fe2121a20ddcbb7d24b148b2ec2ba07e0b9a04da81ae4d14269d0062955961679ac5c7532de1e6e5
+EBUILD rfcview-0.13.ebuild 488 BLAKE2B 40606a05de10e3666b37dc161f3732193e25154f28eaed8322148b4ff49944f13535b7e18cae3425c36bdeb51e4d227aea9349a154d6c87b0dbb4227da81c823 SHA512 beed40b9a9cf5e33fe1acf69d5e1e1aa3732bf1481d74c785b394d0dbb0ef7ab057a85d00e4b4d3425c564dcc5c1f3bcadd219ebf742908dc73f95f89f5bd57e
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/rfcview/files/50rfcview-gentoo.el b/app-emacs/rfcview/files/50rfcview-gentoo.el
new file mode 100644
index 000000000000..a53d51851eb5
--- /dev/null
+++ b/app-emacs/rfcview/files/50rfcview-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'rfcview-mode "rfcview" nil t)
+(add-to-list 'auto-mode-alist
+ '("/rfc[0-9]+\\.txt\\(\\.gz\\)?\\'" . rfcview-mode))
diff --git a/app-emacs/rfcview/metadata.xml b/app-emacs/rfcview/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/rfcview/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/rfcview/rfcview-0.13.ebuild b/app-emacs/rfcview/rfcview-0.13.ebuild
new file mode 100644
index 000000000000..9c609a16ed29
--- /dev/null
+++ b/app-emacs/rfcview/rfcview-0.13.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Emacs mode that reformats IETF RFCs for display"
+HOMEPAGE="http://www.loveshack.ukfsn.org/emacs/
+ https://www.emacswiki.org/emacs/RfcView"
+# taken from http://www.loveshack.ukfsn.org/emacs/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="alpha amd64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/riece-8.0.0 b/app-emacs/riece-8.0.0
deleted file mode 100644
index c66c53b80953..000000000000
--- a/app-emacs/riece-8.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A redesign of Liece IRC client
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/riece/
-IUSE=l10n_ja
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+ FDL-1.1+
-RDEPEND=>=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/riece/riece-8.0.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=71a44dbf6f3b2ddb5f7ecf394be66aa7
diff --git a/app-emacs/riece-9.0.0 b/app-emacs/riece-9.0.0
deleted file mode 100644
index b4662007f39a..000000000000
--- a/app-emacs/riece-9.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A redesign of Liece IRC client
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/riece/
-IUSE=l10n_ja
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+ FDL-1.1+
-RDEPEND=>=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/riece/riece-9.0.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=160f9d8694ab1b3354d7c45461d1771a
diff --git a/app-emacs/riece/Manifest b/app-emacs/riece/Manifest
new file mode 100644
index 000000000000..548933ee7dd2
--- /dev/null
+++ b/app-emacs/riece/Manifest
@@ -0,0 +1,6 @@
+AUX 50riece-gentoo.el 81 BLAKE2B 861847fd8393a454a03c810c895a62b9741a33c640988b5370fb726b0428eb506c44199009d2b593c9c9f1d0d44373e5f971642016ec4fd1b13d0383c808de59 SHA512 bbf327290280b0e5e43298c44ea62c9fb5260de5a615fb056a1d7b11e8fb26f04666dd16e272fad731469dce42b41491229123e0a107dd7a1f958931ef5a3a32
+DIST riece-8.0.0.tar.gz 432370 BLAKE2B 042392697d6110490dcdb278fe8c9c68983b1d926f97231ddf08967735c3f526f41a7135378d49dcfba1344c0092cf43ce7ebe05ca039053002d166182c22601 SHA512 ac219f882c2dedcba2bf3d75e5b934c363dfdd6d8f9e35ce11040d85fca526f8368a57535b729952d6f2731f3ec328bad3913426d0bb0b4bff78a407bfd63a96
+DIST riece-9.0.0.tar.gz 438553 BLAKE2B eaa54c7f5b445657b0a1e09914b145ccaa88a26c5f14d7b6c37061c25b90210f4fd0ec9bb6867ed881212314d0f4d9fe81f60fbde64accf8091d72cc6f9a8576 SHA512 3fbfa4a6d898a713248ce217939af208729eb441ab7ecea2d2c028ce228db1363cb7d90d0de4636bd9fe10813c73f9ef70fb003cfc2fe64ec25b71c9821e8bf6
+EBUILD riece-8.0.0.ebuild 819 BLAKE2B 753750910d723231a88bcb6c45257e93aa71a271f095d369be5397599ae569eae118cce9e2c917ebeaef15e066e0c3958952450d00c2769e3c4f5b4434cfb394 SHA512 3df864f1b103c8fc8dd7f754df9760d3154ce3675cb8da14b5cec8d9c0fbe7db08ab7c3800a6cef53689dcb81492c30e29e15f382f07b0218a8501f6339771c0
+EBUILD riece-9.0.0.ebuild 819 BLAKE2B c187c3eeef7f5a6d8b6f0e2a356e73f7cc024fd873eed25428d15e1984907c51f6da1740b03116721f6404f15e362a19d3a80740fa1138becf850a378b3c0b64 SHA512 cda075586389ebbe038f1cbf43f012481071a32f4d3445c645f60ac7fea556db37e36721c9f37844475a735443a0519570c95903bd056676090130f69f7aea3e
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/riece/files/50riece-gentoo.el b/app-emacs/riece/files/50riece-gentoo.el
new file mode 100644
index 000000000000..e319fe63308d
--- /dev/null
+++ b/app-emacs/riece/files/50riece-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'riece "riece" "Start riece." t)
diff --git a/app-emacs/riece/metadata.xml b/app-emacs/riece/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/riece/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/riece/riece-8.0.0.ebuild b/app-emacs/riece/riece-8.0.0.ebuild
new file mode 100644
index 000000000000..68b8bfcd09ea
--- /dev/null
+++ b/app-emacs/riece/riece-8.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="A redesign of Liece IRC client"
+HOMEPAGE="http://www.nongnu.org/riece/"
+SRC_URI="http://download.savannah.gnu.org/releases/riece/${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="l10n_ja"
+RESTRICT="test"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+ econf --with-lispdir="${EPREFIX}${SITELISP}"
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ lispdir="${ED}${SITELISP}" \
+ install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc AUTHORS NEWS README doc/HACKING lisp/ChangeLog*
+
+ if use l10n_ja; then
+ dodoc NEWS.ja README.ja doc/HACKING.ja
+ else
+ rm -f "${ED}"/usr/share/info/riece-ja.info*
+ fi
+}
diff --git a/app-emacs/riece/riece-9.0.0.ebuild b/app-emacs/riece/riece-9.0.0.ebuild
new file mode 100644
index 000000000000..5046117f6784
--- /dev/null
+++ b/app-emacs/riece/riece-9.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A redesign of Liece IRC client"
+HOMEPAGE="http://www.nongnu.org/riece/"
+SRC_URI="http://download.savannah.gnu.org/releases/riece/${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="l10n_ja"
+RESTRICT="test"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+ econf --with-lispdir="${EPREFIX}${SITELISP}"
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ lispdir="${ED}${SITELISP}" \
+ install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc AUTHORS NEWS README doc/HACKING lisp/ChangeLog*
+
+ if use l10n_ja; then
+ dodoc NEWS.ja README.ja doc/HACKING.ja
+ else
+ rm -f "${ED}"/usr/share/info/riece-ja.info*
+ fi
+}
diff --git a/app-emacs/rnc-mode-1.0_beta3 b/app-emacs/rnc-mode-1.0_beta3
deleted file mode 100644
index 1ec525230231..000000000000
--- a/app-emacs/rnc-mode-1.0_beta3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Emacs mode for editing Relax NG compact schema files
-EAPI=0
-HOMEPAGE=http://www.pantor.com/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.pantor.com/RncMode-1_0b3.tgz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=454ab1ba09ea37b4d8409f57409ddc81
diff --git a/app-emacs/rnc-mode/Manifest b/app-emacs/rnc-mode/Manifest
new file mode 100644
index 000000000000..841fa32ec76d
--- /dev/null
+++ b/app-emacs/rnc-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50rnc-mode-gentoo.el 167 BLAKE2B d0cc5eaac8f7189777e55823e4ddb4435e73d2195b1964fb780c365ce06a85ba5aae5a8c100b542ac7e8a0988a70c99eae0e371916cc734a8cf4b1c00a777ffb SHA512 0802063fb7c947564ded8f81677897d73dcb0ad8127d03bd3b7aeb04a4f53d0d26c70efd4e942c5aee0780a22d29de4fc3dd39adad7bd5f79d23ddfd24cdacc9
+DIST RncMode-1_0b3.tgz 3420 BLAKE2B f955f4bb3064e54756ffaf377f4b0f51e65a62d5255e3e7516836576b8c84481945ae176d43f0e2066aacdf605714d935fd4e043fba711026bd3568d8f66404f SHA512 0118e7b03dc039568ed427f9268878075077c360e34cd7fd9a565a11418161037890b08cc6169ddf92289ca1bdb66a1e373910b67735085a18618089729416cd
+EBUILD rnc-mode-1.0_beta3.ebuild 439 BLAKE2B e10a1a00bf1d3f9775d3ffe7bac7d9e6b965bdefb22dd2c5eed2e61d5bc89feaeaa1ecaaf86ada254df8697daeb207842dc825a056b8e48f20a67b8a5ee7a0be SHA512 2c0544b039650f70c4e8339e44a7d484035e85efcff438904a3ea5536b736bef68d5713c4dce06b575cc7513406c2f8699a17c87dd18839abce610c3965fd309
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/rnc-mode/files/50rnc-mode-gentoo.el b/app-emacs/rnc-mode/files/50rnc-mode-gentoo.el
new file mode 100644
index 000000000000..a820f181e3ff
--- /dev/null
+++ b/app-emacs/rnc-mode/files/50rnc-mode-gentoo.el
@@ -0,0 +1,7 @@
+
+;;; rnc-mode site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'rnc-mode "rnc-mode")
+(add-to-list 'auto-mode-alist '("\\.rnc\\'" . rnc-mode))
diff --git a/app-emacs/rnc-mode/metadata.xml b/app-emacs/rnc-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/rnc-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/rnc-mode/rnc-mode-1.0_beta3.ebuild b/app-emacs/rnc-mode/rnc-mode-1.0_beta3.ebuild
new file mode 100644
index 000000000000..28f487ec9a80
--- /dev/null
+++ b/app-emacs/rnc-mode/rnc-mode-1.0_beta3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit elisp
+
+MY_PV=${PV/./_}
+MY_PV=${MY_PV/_beta/b}
+
+DESCRIPTION="An Emacs mode for editing Relax NG compact schema files"
+HOMEPAGE="http://www.pantor.com/"
+SRC_URI="http://www.pantor.com/RncMode-${MY_PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+SITEFILE=50${PN}-gentoo.el
+
+S="${WORKDIR}"
diff --git a/app-emacs/rpm-spec-mode-0.15 b/app-emacs/rpm-spec-mode-0.15
deleted file mode 100644
index 650528bd8219..000000000000
--- a/app-emacs/rpm-spec-mode-0.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs mode to ease editing of RPM spec files
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/RpmSpecMode
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rpm-spec-mode-0.15.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=c2e58e28a9eb5afcfb8279229609d7a2
diff --git a/app-emacs/rpm-spec-mode/Manifest b/app-emacs/rpm-spec-mode/Manifest
new file mode 100644
index 000000000000..2c3a449ea069
--- /dev/null
+++ b/app-emacs/rpm-spec-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50rpm-spec-mode-gentoo.el 188 BLAKE2B 03ce71a3d7383b4a34eca735a312c4d974c1494471bc038cc3a77ca4fd5d11832c2daa56ce2d9f77ccd3dad589173a446d285cb37a302d1d8f0df5f6bc570ab5 SHA512 60a6c11f7ef2c0043c9c2f502d0cf1d2976a5e33eb47735b00a0b4b99cded6f635386a5ad5680b0eac7604e00aee8f508df53a79263bb0dfe82c076ca5fa4657
+DIST rpm-spec-mode-0.15.el.xz 11176 BLAKE2B 209720693ab1d749187ce923534db18ecc57daabf83bd9051988a2ae660df8482370f33aae3730152f99c1267ad366848ba6b7df72ad9a8c7b195ea94313b224 SHA512 cd2f1dc1d3b7bc18512d14bdbc8b73183b0d917e93911aa5c88bd847cbf24f090480cdac46f9f8a82336085ea801abbbed567fce19498cc70661d051dfa287dc
+EBUILD rpm-spec-mode-0.15.ebuild 459 BLAKE2B 8b57ab69cae009589b579125b9f98405f1d35cf7fc002d5740dcf502badd6d687c4c553e5e031a9b7fe7788b2aa968f2f5919e8d4281a2d4dfa931703c5edc36 SHA512 8e97a340671f65e63d5f0cbef8ad89c167250c15fe7fbfe8af90b66c5f54559deb0756bb62e93a3547bdd0f51f2f3720909b2facc64d5307b6690e651addc197
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/rpm-spec-mode/files/50rpm-spec-mode-gentoo.el b/app-emacs/rpm-spec-mode/files/50rpm-spec-mode-gentoo.el
new file mode 100644
index 000000000000..9075e02c5b7d
--- /dev/null
+++ b/app-emacs/rpm-spec-mode/files/50rpm-spec-mode-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'rpm-spec-mode "rpm-spec-mode"
+ "Major mode for editing RPM spec files." t)
+(add-to-list 'auto-mode-alist '("\\.spec\\'" . rpm-spec-mode))
diff --git a/app-emacs/rpm-spec-mode/metadata.xml b/app-emacs/rpm-spec-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/rpm-spec-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.ebuild b/app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.ebuild
new file mode 100644
index 000000000000..0f7ca5284d9b
--- /dev/null
+++ b/app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Emacs mode to ease editing of RPM spec files"
+HOMEPAGE="https://www.emacswiki.org/emacs/RpmSpecMode"
+# taken from http://www.tihlde.org/~stigb/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ruby-mode-2.0.0_p247 b/app-emacs/ruby-mode-2.0.0_p247
deleted file mode 100644
index 4de973da901b..000000000000
--- a/app-emacs/ruby-mode-2.0.0_p247
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major mode for editing Ruby code
-EAPI=5
-HOMEPAGE=http://www.ruby-lang.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://ruby/ruby-2.0.0-p247.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=6b84a469160e067002ca75900c919aec
diff --git a/app-emacs/ruby-mode-2.2.2 b/app-emacs/ruby-mode-2.2.2
deleted file mode 100644
index 69899561491a..000000000000
--- a/app-emacs/ruby-mode-2.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major mode for editing Ruby code
-EAPI=5
-HOMEPAGE=http://www.ruby-lang.org/
-KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://ruby/ruby-2.2.2.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=6fad4280e25b0e64ea19ae37cee98431
diff --git a/app-emacs/ruby-mode-2.3.0 b/app-emacs/ruby-mode-2.3.0
deleted file mode 100644
index c9128582b06c..000000000000
--- a/app-emacs/ruby-mode-2.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major mode for editing Ruby code
-EAPI=5
-HOMEPAGE=http://www.ruby-lang.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://ruby/ruby-2.3.0.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=9279b393c8061ee05149198a4dcbb0e0
diff --git a/app-emacs/ruby-mode-2.4.1 b/app-emacs/ruby-mode-2.4.1
deleted file mode 100644
index c0265c9ed4c7..000000000000
--- a/app-emacs/ruby-mode-2.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major mode for editing Ruby code
-EAPI=5
-HOMEPAGE=https://www.ruby-lang.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://ruby/ruby-2.4.1.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=5925b40e2b38b0b875de5ff991cffe00
diff --git a/app-emacs/ruby-mode-2.5.0 b/app-emacs/ruby-mode-2.5.0
deleted file mode 100644
index e5ab91928d62..000000000000
--- a/app-emacs/ruby-mode-2.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major mode for editing Ruby code
-EAPI=5
-HOMEPAGE=https://www.ruby-lang.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://ruby/ruby-2.5.0.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=5925b40e2b38b0b875de5ff991cffe00
diff --git a/app-emacs/ruby-mode/Manifest b/app-emacs/ruby-mode/Manifest
new file mode 100644
index 000000000000..716e52f035c7
--- /dev/null
+++ b/app-emacs/ruby-mode/Manifest
@@ -0,0 +1,17 @@
+AUX 50ruby-mode-gentoo-2.2.2.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
+AUX 50ruby-mode-gentoo-2.3.0.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
+AUX 50ruby-mode-gentoo-2.4.1.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
+AUX 50ruby-mode-gentoo-2.5.0.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
+AUX 50ruby-mode-gentoo.el 420 BLAKE2B 349d61eaae28873b6381139e6ec79b7f87ada03665e1611196d8997324429b2c757cb63568de106f75ca2b6e3084f21cfdeabd8568874da1722833a832cbfc3f SHA512 1b1063effe3132f2ab4f122957e8fb2cec1bb2ce4dfda38c183851408f33da3440730caeb3db96d1310f01163ad042e2753e1b5c3e1e04183a694230782c8b1e
+AUX ruby-mode-1.9.3_p429-last-command-char.patch 763 BLAKE2B eae2ec3ab822cabc08a8a2f958e5a2ac5ec2cf7b530e8be95ad7cae65b2bce26b983fcd89d78d5ca95b649450055ddfff50227606bed4dca9fb18b3df614d56a SHA512 3b42fb73b882350e9ef3d39fdfa91b5f43f19602ffd47db6bed912c36d360aae76519ecf6db6b2573ff98624bc2e9f4f404ae94ab3d4c24e0724d8fa693c2485
+DIST ruby-2.0.0-p247.tar.bz2 10804581 BLAKE2B b7f2f8234426361f7e53965ef93aada24f63975c4f920656541024ffced84a19b0e53f1c985879e3ca08ae9424f2b5b005afa31527eccb581ff7201e94b5b27c SHA512 9bd793d0df8f0704fb1521a937c09ecc89b777851312793f0b3391df11dec8239808585697b932c4a94665fa29c7781503166dbd109f269811788c4c648f285f
+DIST ruby-2.2.2.tar.xz 10463044 BLAKE2B 77e1bda547102da9aa47c1ca58c9c8189b204019605ca6363df678a4590fe59f63910a657bb653d605aab612351e09ba0384351e552c788fb6c54520fe9c6277 SHA512 bd72d0a4c017e2527659f64ef2781bbe8bd540a2302eaa60234a12282fd53c359e04205c56385402c67e81bb9dab3b88de53de82e12bb13e3386c26301043b64
+DIST ruby-2.3.0.tar.xz 11294412 BLAKE2B 2c1324154aadd287952cc6430891048ea69922c063b1b2bac89b58603247eb09a79a8c527259d59ceabfc7be08ec2528c982bf2b0f1a223cf3e60d7a3934e8bc SHA512 d893c5e6db5a0533e0da48d899c619964388852ef90e7d1b92a4363d5f189cd2dba32a009581f62b9f42a8e6027975fc3c18b64faf356f5e3ac43a8d69ec5327
+DIST ruby-2.4.1.tar.xz 9939188 BLAKE2B 5be893c8996d17ff333276a772747d3099cec0c41331e1a1916679afc43a8ad5ed99a827bc76b32652ec950eaec933dbe28e1dde313987c2891f258ba7097af7 SHA512 e6fd290b6edd166348b70f0f1c56f7ed9d956c4c1eb91d97d0548041ca4196b9b75ec1ad35c745bdbfd4de195899093e7205d7f02b014ecf1c48e6f31cf25903
+DIST ruby-2.5.0.tar.xz 11292472 BLAKE2B 852ce003a79d9d77e72928353382962440e99ed1d03558c89a928e8f4a582b27357ef63e3ef45f3b30009f7a95f356100941bd84151571ade3a88b2d0595f8ad SHA512 55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111ab0f444677672aac1ba725820182940d485efb2db0bf2bc96737c5d40c54578
+EBUILD ruby-mode-2.0.0_p247.ebuild 568 BLAKE2B 24b39cf684d204d000ccee421c8d06186e36c7bf444790e36ffa6987ba6a2b5d1927b527ee47af55cf0cfccf8990692dcb31ab584d3d1befc811afe96a8a19bc SHA512 69a1c4bcecb6a545b5a9c871152f5917524b158df8fdf507989f53f0968830613a86986e82c62771f3632979e4129c0fc1b70ed262ce193fb7730484590b0a6b
+EBUILD ruby-mode-2.2.2.ebuild 496 BLAKE2B 7227da6ffc85192d2c13ac6e1a172e26f40892f0dfb39e11020584d5e4dca28bea31f864b26fdb429e9633bf2c40b8e55a3ed9f1078d459032fa7ee767f33212 SHA512 5dd65768c7b7d51f1bff2b4ac12918fbb4178f876fa1ef8ade21623fa51bdb36496c4e247b40a3dc27c6f8e2786276f73c77fa7287fd8d8534213606b986b374
+EBUILD ruby-mode-2.3.0.ebuild 494 BLAKE2B 31c71bd89eff5c173571f09ceff570f16c8f9ca01ded4541f8f021c96212f8c0112b49ba58f409ecd1caf9016706d8f254d938575cb3a324b6890ed6f2a3bb14 SHA512 0df916f8b8a5d7a3d2a7fa0613e74e3306398cb5f1a1c59f2bde940c9dba060f5675580cf5091333a243227b5c23bb4e176f86f9151e0311c95799c82a181efa
+EBUILD ruby-mode-2.4.1.ebuild 504 BLAKE2B 1328c07be2fd2c8e082cef902a973b79ae3962b3c0696c25602a2461020e47275ed378d791b6bd1208919cd02ff84e874359ee118caed5c5b1b0d41070184bb7 SHA512 fc416f5069b4758a889555f087882846b86fb482e3b615475ee2ab2f4c469662094f4b2b4ccc027ce2d874a0c4e31413a5e25e90a9ac5edf789550a9e1c7c744
+EBUILD ruby-mode-2.5.0.ebuild 504 BLAKE2B 1328c07be2fd2c8e082cef902a973b79ae3962b3c0696c25602a2461020e47275ed378d791b6bd1208919cd02ff84e874359ee118caed5c5b1b0d41070184bb7 SHA512 fc416f5069b4758a889555f087882846b86fb482e3b615475ee2ab2f4c469662094f4b2b4ccc027ce2d874a0c4e31413a5e25e90a9ac5edf789550a9e1c7c744
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.2.2.el b/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.2.2.el
new file mode 100644
index 000000000000..691abdfdaf99
--- /dev/null
+++ b/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.2.2.el
@@ -0,0 +1,12 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'ruby-mode "ruby-mode" "Major mode to edit ruby files." t)
+
+(add-to-list 'auto-mode-alist '("Rakefile\\'" . ruby-mode))
+(add-to-list 'auto-mode-alist '("\\.\\(rake\\|rb\\)\\'" . ruby-mode))
+(add-to-list 'interpreter-mode-alist '("ruby" . ruby-mode))
+
+(autoload 'run-ruby "inf-ruby" "Run an inferior Ruby process" t)
+(autoload 'inf-ruby-keys "inf-ruby" "Set local key defs for inf-ruby in ruby-mode")
+
+(add-hook 'ruby-mode-hook 'inf-ruby-keys)
diff --git a/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.3.0.el b/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.3.0.el
new file mode 100644
index 000000000000..691abdfdaf99
--- /dev/null
+++ b/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.3.0.el
@@ -0,0 +1,12 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'ruby-mode "ruby-mode" "Major mode to edit ruby files." t)
+
+(add-to-list 'auto-mode-alist '("Rakefile\\'" . ruby-mode))
+(add-to-list 'auto-mode-alist '("\\.\\(rake\\|rb\\)\\'" . ruby-mode))
+(add-to-list 'interpreter-mode-alist '("ruby" . ruby-mode))
+
+(autoload 'run-ruby "inf-ruby" "Run an inferior Ruby process" t)
+(autoload 'inf-ruby-keys "inf-ruby" "Set local key defs for inf-ruby in ruby-mode")
+
+(add-hook 'ruby-mode-hook 'inf-ruby-keys)
diff --git a/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.4.1.el b/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.4.1.el
new file mode 100644
index 000000000000..691abdfdaf99
--- /dev/null
+++ b/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.4.1.el
@@ -0,0 +1,12 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'ruby-mode "ruby-mode" "Major mode to edit ruby files." t)
+
+(add-to-list 'auto-mode-alist '("Rakefile\\'" . ruby-mode))
+(add-to-list 'auto-mode-alist '("\\.\\(rake\\|rb\\)\\'" . ruby-mode))
+(add-to-list 'interpreter-mode-alist '("ruby" . ruby-mode))
+
+(autoload 'run-ruby "inf-ruby" "Run an inferior Ruby process" t)
+(autoload 'inf-ruby-keys "inf-ruby" "Set local key defs for inf-ruby in ruby-mode")
+
+(add-hook 'ruby-mode-hook 'inf-ruby-keys)
diff --git a/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.5.0.el b/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.5.0.el
new file mode 100644
index 000000000000..691abdfdaf99
--- /dev/null
+++ b/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.5.0.el
@@ -0,0 +1,12 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'ruby-mode "ruby-mode" "Major mode to edit ruby files." t)
+
+(add-to-list 'auto-mode-alist '("Rakefile\\'" . ruby-mode))
+(add-to-list 'auto-mode-alist '("\\.\\(rake\\|rb\\)\\'" . ruby-mode))
+(add-to-list 'interpreter-mode-alist '("ruby" . ruby-mode))
+
+(autoload 'run-ruby "inf-ruby" "Run an inferior Ruby process" t)
+(autoload 'inf-ruby-keys "inf-ruby" "Set local key defs for inf-ruby in ruby-mode")
+
+(add-hook 'ruby-mode-hook 'inf-ruby-keys)
diff --git a/app-emacs/ruby-mode/files/50ruby-mode-gentoo.el b/app-emacs/ruby-mode/files/50ruby-mode-gentoo.el
new file mode 100644
index 000000000000..c1f9602d19d8
--- /dev/null
+++ b/app-emacs/ruby-mode/files/50ruby-mode-gentoo.el
@@ -0,0 +1,11 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'ruby-mode "ruby-mode" "Major mode to edit ruby files." t)
+
+(add-to-list 'auto-mode-alist '("\\.rb\\'" . ruby-mode))
+(add-to-list 'interpreter-mode-alist '("ruby" . ruby-mode))
+
+(autoload 'run-ruby "inf-ruby" "Run an inferior Ruby process" t)
+(autoload 'inf-ruby-keys "inf-ruby" "Set local key defs for inf-ruby in ruby-mode")
+
+(add-hook 'ruby-mode-hook 'inf-ruby-keys)
diff --git a/app-emacs/ruby-mode/files/ruby-mode-1.9.3_p429-last-command-char.patch b/app-emacs/ruby-mode/files/ruby-mode-1.9.3_p429-last-command-char.patch
new file mode 100644
index 000000000000..4d4bb2775c83
--- /dev/null
+++ b/app-emacs/ruby-mode/files/ruby-mode-1.9.3_p429-last-command-char.patch
@@ -0,0 +1,22 @@
+commit 595825dc577616862b271ffac4c58eb27f0610af
+Author: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
+Date: Sun Apr 21 10:04:54 2013 +0000
+
+ Replace use of obsolete variable `last-command-char` by @maser [fix GH-290]
+
+
+ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
+
+diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
+index dcaa396..ace0f27 100644
+--- a/misc/ruby-mode.el
++++ b/misc/ruby-mode.el
+@@ -874,7 +874,7 @@ Also ignores spaces after parenthesis when 'space."
+
+ (defun ruby-electric-brace (arg)
+ (interactive "P")
+- (insert-char last-command-char 1)
++ (insert-char last-command-event 1)
+ (ruby-indent-line t)
+ (delete-char -1)
+ (self-insert-command (prefix-numeric-value arg)))
diff --git a/app-emacs/ruby-mode/metadata.xml b/app-emacs/ruby-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/ruby-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/ruby-mode/ruby-mode-2.0.0_p247.ebuild b/app-emacs/ruby-mode/ruby-mode-2.0.0_p247.ebuild
new file mode 100644
index 000000000000..3b51eb835fcc
--- /dev/null
+++ b/app-emacs/ruby-mode/ruby-mode-2.0.0_p247.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Emacs major mode for editing Ruby code"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/ruby-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+S="${WORKDIR}/ruby-${MY_PV}/misc"
+DOCS="README"
+ELISP_PATCHES="${PN}-1.9.3_p429-last-command-char.patch"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.2.2.ebuild b/app-emacs/ruby-mode/ruby-mode-2.2.2.ebuild
new file mode 100644
index 000000000000..0f4ff6d39b9f
--- /dev/null
+++ b/app-emacs/ruby-mode/ruby-mode-2.2.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing Ruby code"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/ruby-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+S="${WORKDIR}/ruby-${PV}/misc"
+DOCS="README"
+SITEFILE="50${PN}-gentoo-${PV}.el"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild b/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild
new file mode 100644
index 000000000000..ad53fe111d7a
--- /dev/null
+++ b/app-emacs/ruby-mode/ruby-mode-2.3.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing Ruby code"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/ruby-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+S="${WORKDIR}/ruby-${PV}/misc"
+DOCS="README"
+SITEFILE="50${PN}-gentoo-${PV}.el"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.4.1.ebuild b/app-emacs/ruby-mode/ruby-mode-2.4.1.ebuild
new file mode 100644
index 000000000000..414ca4b0090d
--- /dev/null
+++ b/app-emacs/ruby-mode/ruby-mode-2.4.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing Ruby code"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/ruby-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+S="${WORKDIR}/ruby-${PV}/misc"
+DOCS="README"
+SITEFILE="50${PN}-gentoo-${PV}.el"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.5.0.ebuild b/app-emacs/ruby-mode/ruby-mode-2.5.0.ebuild
new file mode 100644
index 000000000000..414ca4b0090d
--- /dev/null
+++ b/app-emacs/ruby-mode/ruby-mode-2.5.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing Ruby code"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/ruby-${PV}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+S="${WORKDIR}/ruby-${PV}/misc"
+DOCS="README"
+SITEFILE="50${PN}-gentoo-${PV}.el"
diff --git a/app-emacs/rudel-0.3_pre20110721-r1 b/app-emacs/rudel-0.3_pre20110721-r1
deleted file mode 100644
index 6810fead0208..000000000000
--- a/app-emacs/rudel-0.3_pre20110721-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-24
-DESCRIPTION=Collaborative editing environment for GNU Emacs
-EAPI=6
-HOMEPAGE=http://rudel.sourceforge.net/ https://www.emacswiki.org/emacs/Rudel
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-24
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rudel-0.3_pre20110721.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=85263b1b75dbbc1c717d2b0d2d6345e9
diff --git a/app-emacs/rudel/Manifest b/app-emacs/rudel/Manifest
new file mode 100644
index 000000000000..ef57f0b692bf
--- /dev/null
+++ b/app-emacs/rudel/Manifest
@@ -0,0 +1,5 @@
+AUX 60rudel-gentoo.el 542 BLAKE2B 2b1e1df77779d5de74db60b434e9a66b9a85a9fddbf2139b7b4f56bb04d1837b77d0b64d126b932a4d3441bbc9dec4039f729c3452ed79e77a98853fb8a2d29b SHA512 8b553141f8ade7c93e5d30298fe921b420a84d005450092473589a91e7e8ce5a0ad76ce7beaf8be1cb8233bb3f1693a4a6d055d034b903d46e5883f1d35386d0
+AUX rudel-0.3_pre20110721-emacs25.patch 9309 BLAKE2B 4cb32e198519de82bee48bc0b3b6ffa32f5efc25afa34a201c43ea0ce23c22be38cb455afe17ad94ebd8b8121396908f3aef0a26b4ba1800a8d04c1f2c1dc8c8 SHA512 6f5d8b6cadf527ea7c8410519d07b2f831e13da10812a5180142ca381d47ee14072ed59251a048d250c5a582998e9fb8205f050f034d7aa21a336b98255b9bc0
+DIST rudel-0.3_pre20110721.tar.xz 416060 BLAKE2B 813ec0dc034a0893c0cc540118d9471fcb353c232ce37b70816183ebc99ff82c16e80eddf015f5d5663c7380a93c29b153871bb1ca58f37f06d4e09bddd87912 SHA512 abf6c8eb4fcaf4acafb9bed7cafff5d3c8e19e3fecd2aa779065bfb11ce5cb198ef14cc9deed360ac895166ea159a821e24dc92dbeda4f5481d1bb3bc2f8c023
+EBUILD rudel-0.3_pre20110721-r1.ebuild 1199 BLAKE2B 420d1983b029be02199dfe4bd3f1d3d090aa33b28917e2d31abd222b23b84ba6b371eb41910666df00443d0b93fc8f288ca4e6b3fdf2913a82424ab877cb25ff SHA512 6f7ebe1ed408b7c2524085fd4af4ecc274f7da04ce03a0127ce8f8015ddd6b3670f41a1eff8bd0d73176de38a3ef69075c3843d5c3ff6f61b04302cde2a1c961
+MISC metadata.xml 781 BLAKE2B 66f1f7794721148546035e40a21b27075a828174825fd0a09a8dd7bfdc863ad585dd3aa093745c6494e488d2cce85494b346d45c5ffaa7ae905927be4c8e8123 SHA512 2df67c7b3175b5f6d0109a2627abb9f12b5ab7f88bb8fe386e786ce4014d8c1c7886cdab181a928d9ba8ab1d932823fe90ef782341d0cbbf6c07f84952bb9326
diff --git a/app-emacs/rudel/files/60rudel-gentoo.el b/app-emacs/rudel/files/60rudel-gentoo.el
new file mode 100644
index 000000000000..2383074cfe17
--- /dev/null
+++ b/app-emacs/rudel/files/60rudel-gentoo.el
@@ -0,0 +1,13 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'rudel-join-session "rudel-loaddefs"
+ "Start a collaborative Rudel session" t)
+(autoload 'rudel-host-session "rudel-loaddefs"
+ "Host a collaborative Rudel session" t)
+(autoload 'rudel-speedbar "rudel-loaddefs"
+ "Show connected users and documents for the Rudel session in speedbar" t)
+(autoload 'global-rudel-minor-mode "rudel-loaddefs"
+ "Bindings for rudel session-level commands" t)
+
+;;(global-set-key (kbd "C-c c j") 'rudel-join-session)
+
+(setq rudel-icons-directory "@SITEETC@/icons/")
diff --git a/app-emacs/rudel/files/rudel-0.3_pre20110721-emacs25.patch b/app-emacs/rudel/files/rudel-0.3_pre20110721-emacs25.patch
new file mode 100644
index 000000000000..98aa38f370d7
--- /dev/null
+++ b/app-emacs/rudel/files/rudel-0.3_pre20110721-emacs25.patch
@@ -0,0 +1,341 @@
+Fix byte-compilation with Emacs 25.
+https://bugs.gentoo.org/590340
+
+This comprises parts of the following commits from ELPA:
+
+commit 9ec4b84e27f3faae8ad3eb5d3e96c523ce1fece2
+Author: Stefan Monnier <monnier@iro.umontreal.ca>
+Date: Sun Jul 10 18:16:39 2016 -0400
+
+ * rudel-backend.el: Try and fix compilation problem
+
+commit 5e4f147f6b23c392505cb0cbb5f13384d6d96304
+Author: Stefan Monnier <monnier@iro.umontreal.ca>
+Date: Mon May 12 02:23:00 2014 -0400
+
+ Fix up headers and compilation
+
+--- rudel-orig/rudel-backend.el
++++ rudel/rudel-backend.el
+@@ -46,8 +46,7 @@
+ ;;; Code:
+ ;;
+
+-(eval-when-compile
+- (require 'cl))
++(require 'cl)
+
+ (require 'warnings)
+
+@@ -97,24 +96,34 @@
+ "Factory class that holds an object for each known backend
+ category. Objects manage backend implementation for one backend
+ category each.")
+-(oset-default rudel-backend-factory factories
++(oset-default 'rudel-backend-factory factories
+ (make-hash-table :test #'eq))
+
+-(defmethod initialize-instance ((this rudel-backend-factory) &rest slots)
++(defmethod initialize-instance ((this rudel-backend-factory) &rest _slots)
+ "Initialize slots of THIS with SLOTS."
+ (when (next-method-p)
+ (call-next-method))
+- (oset this :backends (make-hash-table :test #'eq)))
++ (oset this backends (make-hash-table :test #'eq)))
++
++;;;###autoload
++(progn
++(defmacro rudel--with-memoization (place &rest code)
++ (declare (indent 1) (debug t))
++ (gv-letplace (getter setter) place
++ `(or ,getter
++ ,(macroexp-let2 nil val (macroexp-progn code)
++ `(progn
++ ,(funcall setter val)
++ ,val))))))
+
+ ;;;###autoload
+ (defmethod rudel-get-factory :static ((this rudel-backend-factory)
+ category)
+ "Return the factory responsible for CATEGORY.
+ If there is no responsible factory, create one and return it."
+- (with-slots (factories) this
+- (or (gethash category factories)
+- (puthash category (rudel-backend-factory category) factories)))
+- )
++ (rudel--with-memoization
++ (gethash category (eieio-oref-default this 'factories))
++ (make-instance 'rudel-backend-factory))) ;; category
+
+ ;;;###autoload
+ (defmethod rudel-add-backend ((this rudel-backend-factory)
+@@ -188,7 +197,8 @@
+ (unless (object-p class)
+ (condition-case error
+ (puthash name (make-instance
+- class (symbol-name name)) backends)
++ class (symbol-name name))
++ backends)
+ (error
+ ;; Store this error on the name symbol of the backend for
+ ;; later display.
+@@ -224,7 +234,7 @@
+ ;;;###autoload
+ (defun rudel-backend-get-factory (category)
+ "A shortcut for getting the factory object for CATEGORY."
+- (rudel-get-factory rudel-backend-factory category))
++ (rudel-get-factory 'rudel-backend-factory category))
+
+ (defun rudel-backend-suitable-backends (category predicate)
+ "Return backends from category CATEGORY that satisfy PREDICATE.
+@@ -290,15 +300,15 @@
+
+ ;; Insert all backends provided by this factory.
+ (dolist (backend (rudel-all-backends factory))
+- (if (or (object-p (cdr backend))
+- (null (get (car backend)
+- 'rudel-backend-last-load-error)))
+- (insert (rudel-backend--format-backend-normal backend))
+- (insert (rudel-backend--format-backend-error backend))))
++ (insert (if (or (object-p (cdr backend))
++ (null (get (car backend)
++ 'rudel-backend-last-load-error)))
++ (rudel-backend--format-backend-normal backend)
++ (rudel-backend--format-backend-error backend))))
+
+ ;; One empty line between backend categories.
+ (insert "\n"))
+- (oref rudel-backend-factory factories))
++ (oref-default 'rudel-backend-factory factories))
+ (current-buffer))
+
+ (defun rudel-backend--format-backend-normal (backend)
+@@ -316,7 +326,7 @@
+ (propertize
+ (if (object-p (cdr backend))
+ (mapconcat #'prin1-to-string
+- (oref (cdr backend) :version)
++ (oref (cdr backend) version)
+ ".")
+ "?")
+ 'face 'font-lock-constant-face)
+@@ -324,7 +334,7 @@
+ (propertize
+ (if (object-p (cdr backend))
+ (mapconcat #'prin1-to-string
+- (oref (cdr backend) :capabilities)
++ (oref (cdr backend) capabilities)
+ " ")
+ "?")
+ 'face 'font-lock-constant-face))
+--- rudel-orig/rudel-color.el
++++ rudel/rudel-color.el
+@@ -46,6 +46,7 @@
+ ;;; Code:
+ ;;
+
++(eval-when-compile (require 'cl))
+
+ ;;; RGV <-> HSV conversion
+ ;;
+--- rudel-orig/rudel.el
++++ rudel/rudel.el
+@@ -41,8 +41,7 @@
+ ;;; Code:
+ ;;
+
+-(eval-when-compile
+- (require 'cl))
++(require 'cl)
+
+ (require 'eieio)
+ (require 'eieio-base)
+--- rudel-orig/rudel-icons.el
++++ rudel/rudel-icons.el
+@@ -41,8 +41,9 @@
+ ;;; Image constants
+ ;;
+
++(eval-and-compile
+ (defconst rudel-icons-image-formats '(svg png)
+- "Image formats to try (in that order) when loading Rudel icons.")
++ "Image formats to try (in that order) when loading Rudel icons."))
+
+ (defvar rudel-icons-directory
+ (file-name-as-directory
+--- rudel-orig/rudel-interactive.el
++++ rudel/rudel-interactive.el
+@@ -38,6 +38,7 @@
+
+ ;;; Code:
+ ;;
++(require 'cl)
+
+ (require 'rudel-compat) ;; for `read-color' replacement
+ (require 'rudel-backend) ;; for `rudel-backend-cons-p'
+@@ -80,25 +81,29 @@
+ (setq prompt "Session: "))
+ ;; For presentation and identification of sessions, use the :name
+ ;; property.
+- (flet ((to-string (session)
+- (if (rudel-backend-cons-p session)
+- (symbol-name (car session))
+- (plist-get session :name))))
++ (let ((to-string
++ (lambda (session)
++ (if (rudel-backend-cons-p session)
++ (symbol-name (car session))
++ (plist-get session :name)))))
+ ;; Read a session by name, then return that name or the
+ ;; corresponding session info.
+ (let ((session-name (completing-read prompt
+- (mapcar #'to-string sessions)
++ (mapcar to-string sessions)
+ nil t)))
+ (cond
+ ((eq return 'object)
+ (find session-name sessions
+- :key #'to-string :test #'string=))
++ :key to-string :test #'string=))
+ (t session-name))))
+ )
+
+ (defvar rudel-read-user-name-history nil
+ "History of inputs read by `rudel-read-user-name'.")
+
++(defvar rudel-default-username)
++(defvar rudel-current-session)
++
+ (defun rudel-read-user-name ()
+ "Read a username.
+ The default is taken from `rudel-default-username'."
+--- rudel-orig/rudel-mode.el
++++ rudel/rudel-mode.el
+@@ -48,6 +48,7 @@
+ ;;; Code:
+ ;;
+
++(require 'cl)
+ (require 'easy-mmode)
+ (require 'easymenu)
+
+@@ -132,6 +133,8 @@
+ (rudel-buffer-document))))
+ (force-mode-line-update))
+
++(defvar rudel-header-subscriptions-minor-mode)
++
+ (defun rudel-header-subscriptions--options-changed ()
+ "Update headers in buffers that have header subscriptions mode enabled."
+ (dolist (buffer (buffer-list))
+@@ -228,8 +231,7 @@
+ #'rudel-header-subscriptions--remove-user))
+
+ ;; Reset header line to default format.
+- (setq header-line-format default-header-line-format)
+- (force-mode-line-update)) ;; TODO remove all handlers
++ (kill-local-variable 'header-line-format)) ;; TODO remove all handlers
+
+ ;; No buffer document
+ (t
+@@ -237,8 +239,7 @@
+ (setq rudel-header-subscriptions-minor-mode nil)
+
+ ;; Reset header line to default format.
+- (setq header-line-format default-header-line-format)
+- (force-mode-line-update)))
++ (kill-local-variable 'header-line-format)))
+ )
+
+
+@@ -411,6 +412,8 @@
+ (force-mode-line-update)
+ )
+
++(defvar rudel-mode-line-publish-state-minor-mode)
++
+ (defun rudel-mode-line-publish-state--document-attach (document buffer)
+ "Handle attaching of DOCUMENT to BUFFER.
+ When `rudel-mode-line-publish-state-minor-mode' is enabled in
+--- rudel-orig/rudel-overlay.el
++++ rudel/rudel-overlay.el
+@@ -36,8 +36,7 @@
+
+ (require 'custom)
+
+-(eval-when-compile
+- (require 'cl))
++(require 'cl)
+
+ (require 'eieio)
+
+--- rudel-orig/rudel-session-initiation.el
++++ rudel/rudel-session-initiation.el
+@@ -54,8 +54,7 @@
+ ;;; Code:
+ ;;
+
+-(eval-when-compile
+- (require 'cl))
++(require 'cl)
+
+ (require 'eieio)
+
+--- rudel-orig/rudel-speedbar.el
++++ rudel/rudel-speedbar.el
+@@ -77,6 +77,8 @@
+ '([ "Subscribe" #'ignore t])
+ "Menu part in easymenu format used in speedbar while browsing objects.")
+
++(defvar rudel-current-session)
++
+ (defun rudel-speedbar-toplevel-buttons (dir)
+ "Return a list of objects to display in speedbar.
+ Argument DIR is the directory from which to derive the list of objects."
+--- rudel-orig/rudel-state-machine.el
++++ rudel/rudel-state-machine.el
+@@ -41,8 +41,7 @@
+ ;;; Code:
+ ;;
+
+-(eval-when-compile
+- (require 'cl))
++(require 'cl)
+
+ (require 'eieio)
+
+--- rudel-orig/rudel-transport-util.el
++++ rudel/rudel-transport-util.el
+@@ -48,7 +48,10 @@
+
+ ;;; Code:
+ ;;
+
++(eval-when-compile (require 'cl))
++(require 'eieio)
++(eval-when-compile (require 'rudel-util))
+ (require 'rudel-errors) ;; for `rudel-error'
+ (require 'rudel-transport)
+
+--- rudel-orig/rudel-util.el
++++ rudel/rudel-util.el
+@@ -43,8 +43,7 @@
+ ;;; Code:
+ ;;
+
+-(eval-when-compile
+- (require 'cl))
++(require 'cl)
+
+ (require 'eieio)
+
+--- rudel-orig/rudel-xml.el
++++ rudel/rudel-xml.el
+@@ -45,6 +45,7 @@
+ ;;; Code:
+ ;;
+
++(eval-when-compile (require 'cl))
+ (require 'xml)
+
+
diff --git a/app-emacs/rudel/metadata.xml b/app-emacs/rudel/metadata.xml
new file mode 100644
index 000000000000..9fc76a6d8ba5
--- /dev/null
+++ b/app-emacs/rudel/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ Rudel is collaborative editing environment for GNU Emacs. Its purpose
+ is tod share buffers with other users in order to edit the contents
+ of those buffers collaboratively. Rudel supports multiple backends to
+ enable communication with other collaborative editors using different
+ protocols, though currently Obby (for use with the Gobby editor) is
+ the only fully-functional one.
+</longdescription>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">rudel</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild b/app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild
new file mode 100644
index 000000000000..a1d42fd45fb9
--- /dev/null
+++ b/app-emacs/rudel/rudel-0.3_pre20110721-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit readme.gentoo-r1 elisp
+
+DESCRIPTION="Collaborative editing environment for GNU Emacs"
+HOMEPAGE="http://rudel.sourceforge.net/
+ https://www.emacswiki.org/emacs/Rudel"
+# snapshot of bzr://rudel.bzr.sourceforge.net/bzrroot/rudel/trunk
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}"
+ELISP_PATCHES="${P}-emacs25.patch"
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() {
+ ${EMACS} ${EMACSFLAGS} -l rudel-compile.el || die
+}
+
+src_install() {
+ local dir
+
+ for dir in . adopted infinote jupiter obby socket telepathy tls \
+ xmpp zeroconf
+ do
+ insinto "${SITELISP}/${PN}/${dir}"
+ doins ${dir}/*.{el,elc}
+ done
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ insinto "${SITEETC}/${PN}"
+ doins -r icons
+
+ dodoc README INSTALL ChangeLog TODO doc/card.pdf
+
+ DOC_CONTENTS="Connections to Gobby servers require the gnutls-cli program
+ (net-libs/gnutls).
+ \\n\\nThe Avahi daemon (net-dns/avahi) is required for automatic
+ session discovery and advertising."
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/rust-mode-0.3.0_p20180221 b/app-emacs/rust-mode-0.3.0_p20180221
deleted file mode 100644
index 106432a24e52..000000000000
--- a/app-emacs/rust-mode-0.3.0_p20180221
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=virtual/emacs-24
-DESCRIPTION=A major emacs mode for editing Rust source code
-EAPI=6
-HOMEPAGE=https://github.com/rust-lang/rust-mode
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MIT Apache-2.0 )
-RDEPEND=>=virtual/emacs-24
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rust-mode-0.3.0_p20180221.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=072f698d4157029219fc8b6f466d3e77
diff --git a/app-emacs/rust-mode/Manifest b/app-emacs/rust-mode/Manifest
new file mode 100644
index 000000000000..1fb7e309e1cd
--- /dev/null
+++ b/app-emacs/rust-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50rust-mode-gentoo.el 135 BLAKE2B 083a273140a659c1a76c05178990ffe4b0f3ae2ede81878ce8cfaab451df4a5169cea46fa4600e57ea77a9a7d55571cb7c862098e5ee76677dd73213e6a30036 SHA512 bd6f7579408d26900d40e674ff75bac2d1989c9bd068dae4bd4c54271e7b04cfcdf4d7d3622955f949cb60496a0d055f5f436084975bb624415b46ddb330f0fe
+DIST rust-mode-0.3.0_p20180221.tar.xz 37392 BLAKE2B 185511a2096400254e141f213f2e9a84861c2aaf5f2259cab724aa929e07b2691ae6f36c5568de5d978809588271486377a194a77a066413df6ee995e9bbe54a SHA512 004bd1536ab2e1e708193509a307ed47e22bf1f3dc5d84816958588e312c8bf6e75ee178cc99439ec0bd427ba02030c133bb21f96c5116b175d1d7cde89e9e6c
+EBUILD rust-mode-0.3.0_p20180221.ebuild 679 BLAKE2B da7156d08130a1d2a2b3970f79381f3dcf317770c07537a4c9f6c7cf06d60daafbd4c9091257c36bffa7b56a5a0fc876ba306eb7ce723f6caf897e27f04874d2 SHA512 d97e2791fa05253774fa0bb8ced86205198c22b0a86123e2b6b15631626671b99b3ec3aaf48bd1d71b1bef7574c26e43f7bf0e568f59949c068485b38c9e159a
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/rust-mode/files/50rust-mode-gentoo.el b/app-emacs/rust-mode/files/50rust-mode-gentoo.el
new file mode 100644
index 000000000000..0df93798a429
--- /dev/null
+++ b/app-emacs/rust-mode/files/50rust-mode-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'rust-mode "rust-mode" nil t)
+(add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))
diff --git a/app-emacs/rust-mode/metadata.xml b/app-emacs/rust-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/rust-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/rust-mode/rust-mode-0.3.0_p20180221.ebuild b/app-emacs/rust-mode/rust-mode-0.3.0_p20180221.ebuild
new file mode 100644
index 000000000000..a061b8c60336
--- /dev/null
+++ b/app-emacs/rust-mode/rust-mode-0.3.0_p20180221.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A major emacs mode for editing Rust source code"
+HOMEPAGE="https://github.com/rust-lang/rust-mode"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+ ${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} \
+ -l rust-mode.el -l rust-mode-tests.el \
+ -f ert-run-tests-batch-and-exit || die "tests failed"
+}
+
+src_install() {
+ elisp-install ${PN} rust-mode.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/s-1.11.0 b/app-emacs/s-1.11.0
deleted file mode 100644
index 72de6038de77..000000000000
--- a/app-emacs/s-1.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=The long lost Emacs string manipulation library
-EAPI=6
-HOMEPAGE=https://github.com/magnars/s.el
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/magnars/s.el/archive/1.11.0.tar.gz -> s-1.11.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=5973a823a15ca80de223c9ee8e21bf09
diff --git a/app-emacs/s-1.12.0 b/app-emacs/s-1.12.0
deleted file mode 100644
index 538cc730a501..000000000000
--- a/app-emacs/s-1.12.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=The long lost Emacs string manipulation library
-EAPI=6
-HOMEPAGE=https://github.com/magnars/s.el
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/magnars/s.el/archive/1.12.0.tar.gz -> s-1.12.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=54d87a75642a2220b8a305fb0b1ed56b
diff --git a/app-emacs/s/Manifest b/app-emacs/s/Manifest
new file mode 100644
index 000000000000..e572f8d5d593
--- /dev/null
+++ b/app-emacs/s/Manifest
@@ -0,0 +1,6 @@
+AUX 50s-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST s-1.11.0.tar.gz 46771 BLAKE2B 5cc93e4f52ea4fbb4d4b9b418a632e8bbc789f0f36b9486a4a1b36725e255f4a78d1924a420fd04af5c2bc50a652adfc83db3285569367749fe3712f2f0b560b SHA512 364fa7ea875e9be6db464a826c1259889b67d87817b41cff40ab7da80e0bfc3e27dcadadfd005a64a895ee92644c2dea82789bdf1b1fe538501c40f748455608
+DIST s-1.12.0.tar.gz 59193 BLAKE2B 89e4c453b6590116a4cc08fc1be73519e6c95586c1e80b37f37d7273232aa707cd030cf74106fdd7eb7f05fe8ebd04253592076573472c3927cc1428b4c029f8 SHA512 036369011295dfde7567ae8bd479be9635de479e8821c3fe117a6c3827bc83492bb91e6ac64d4b20b061da95690f5585ed58f116a2b8c877dceee22153c8c990
+EBUILD s-1.11.0.ebuild 432 BLAKE2B 293d3bbd4140bfe798b5329a111ff9f61feda85ca3e913947206e71fdf0d989f60ab7019ff4bb17b0e6d1a0d311a8ab8ce1d1b91c0c280c1df1e9e4e9a6b6131 SHA512 311ded1caa4563d85c897a05343239330131c70f8ebf8e2aa41161315813503f683365e1216280759d9c5928537054525a9220cfad321535edffcf53786dab03
+EBUILD s-1.12.0.ebuild 432 BLAKE2B 2ade0825dfc084c186d5bc08e67ddee272d0227bfa4cc0946972347de9003858cf60e66c368fd3e6aa1065218267199b231ff553a4f65ed3a1fd44aefc4d580c SHA512 36c6d2f266315821f67dfa486c63f2987f525346432e0cbd137157125ce8c9af2de1772d85219068285f7212d23aa4d4e9331577e86ae3b861e216b9fa09c977
+MISC metadata.xml 373 BLAKE2B 7553de03e6dabdf1b74352b5876211bc8f0c5a6ba9e6e84334c3ca069e4521ae56dd28df2ab3574000cd54765486f23ebe13db350821605e77190344514aeef1 SHA512 05637c489e2e7b23f585775b41853c60a7bbf1607679545a129aefd3b125ead6740b26b9c8045fd5721ea67df88773da6deced9973ee346647aa570057d46338
diff --git a/app-emacs/s/files/50s-gentoo.el b/app-emacs/s/files/50s-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/s/files/50s-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/s/metadata.xml b/app-emacs/s/metadata.xml
new file mode 100644
index 000000000000..7970411b7887
--- /dev/null
+++ b/app-emacs/s/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <stabilize-allarches/>
+ <upstream>
+ <remote-id type="github">magnars/s.el</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-emacs/s/s-1.11.0.ebuild b/app-emacs/s/s-1.11.0.ebuild
new file mode 100644
index 000000000000..4cc1a26c6e43
--- /dev/null
+++ b/app-emacs/s/s-1.11.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="The long lost Emacs string manipulation library"
+HOMEPAGE="https://github.com/magnars/s.el"
+SRC_URI="https://github.com/magnars/s.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/s.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emacs/s/s-1.12.0.ebuild b/app-emacs/s/s-1.12.0.ebuild
new file mode 100644
index 000000000000..2a3d49f9a3eb
--- /dev/null
+++ b/app-emacs/s/s-1.12.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="The long lost Emacs string manipulation library"
+HOMEPAGE="https://github.com/magnars/s.el"
+SRC_URI="https://github.com/magnars/s.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/s.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emacs/scala-mode-2.10.3 b/app-emacs/scala-mode-2.10.3
deleted file mode 100644
index ebb0c7fa1e28..000000000000
--- a/app-emacs/scala-mode-2.10.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Scala mode for Emacs
-EAPI=5
-HOMEPAGE=https://www.scala-lang.org/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-lang/scala >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://www.scala-lang.org/files/archive/scala-tool-support-2.10.3.tgz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=c166f8e1187eae832175edd2b5f13e37
diff --git a/app-emacs/scala-mode/Manifest b/app-emacs/scala-mode/Manifest
new file mode 100644
index 000000000000..40ce7ef4b901
--- /dev/null
+++ b/app-emacs/scala-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50scala-mode-gentoo.el 65 BLAKE2B 90302bb73d75edce2b458ca15e3c12d284cace94257f251f4e24be3fdb825b78c48d79daa903bbc83b2be3d388468f8dea4cecb7e7ae6497c2d0f51b20c20f32 SHA512 399fa433716e4f867ebd91fb52da5ea1da503b5e6621943491ceca9c05740ee701879e9d966e2fb266e5ca05d999097b4b9413569385004454c81b8e010ec022
+DIST scala-tool-support-2.10.3.tgz 26040 BLAKE2B 7ff24aa2e16a1eb587e633839b9e6be7a146dfc99b0edaabe260a653aa931ddff6c10dea3d7bb5ad12bc3f25373f7064f20a75945badb3c3e55f4bff5991c697 SHA512 77bd695d1e577d05884a8b70d4edcc6a0af1da13de0f8cdf54d5636e0e93c22ec919ccd3d79e92382b6a9fe8085a08af37b9f5428c1ed14359faf8fc860a81b5
+EBUILD scala-mode-2.10.3.ebuild 470 BLAKE2B d562954f9d1ee1fa31ec5c7816eff8a33d7123eb8f54ddba04c7a6c5c9a807a2fe92dca4282e8eeec19d5fd5cf88449bfff8fe30e352905878c475aa368679a7 SHA512 589399fa85ee152cf9aacc3ba7c5f7be22989a1f122a7796e241230e1f1b8a655b970214059a71e86955531a9320d1d6a26eb102516abf190a2ec004083c2dfb
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/scala-mode/files/50scala-mode-gentoo.el b/app-emacs/scala-mode/files/50scala-mode-gentoo.el
new file mode 100644
index 000000000000..2602df3b4173
--- /dev/null
+++ b/app-emacs/scala-mode/files/50scala-mode-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'scala-mode-auto)
diff --git a/app-emacs/scala-mode/metadata.xml b/app-emacs/scala-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/scala-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/scala-mode/scala-mode-2.10.3.ebuild b/app-emacs/scala-mode/scala-mode-2.10.3.ebuild
new file mode 100644
index 000000000000..30fc0a89b676
--- /dev/null
+++ b/app-emacs/scala-mode/scala-mode-2.10.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+MY_P="scala-tool-support-${PV}"
+DESCRIPTION="Scala mode for Emacs"
+HOMEPAGE="https://www.scala-lang.org/"
+SRC_URI="https://www.scala-lang.org/files/archive/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-lang/scala"
+
+S="${WORKDIR}/${MY_P}/scala-emacs-mode"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="AUTHORS FUTURE README"
diff --git a/app-emacs/scheme-complete-0.8.10 b/app-emacs/scheme-complete-0.8.10
deleted file mode 100644
index c85ea62f20bd..000000000000
--- a/app-emacs/scheme-complete-0.8.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Scheme tab-completion and word-completion for Emacs
-EAPI=4
-HOMEPAGE=http://synthcode.com/
-KEYWORDS=alpha amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=public-domain
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://synthcode.com/emacs/scheme-complete-0.8.10.el.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=906795cc2b7a92d9bc18e9ee60499e78
diff --git a/app-emacs/scheme-complete-0.8.11 b/app-emacs/scheme-complete-0.8.11
deleted file mode 100644
index 0c3d3e1fa310..000000000000
--- a/app-emacs/scheme-complete-0.8.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Scheme tab-completion and word-completion for Emacs
-EAPI=5
-HOMEPAGE=http://synthcode.com/
-KEYWORDS=alpha amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=public-domain
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://synthcode.com/emacs/scheme-complete-0.8.11.el.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=5aa9661dc7a8a9be71c72bab07eaccd7
diff --git a/app-emacs/scheme-complete/Manifest b/app-emacs/scheme-complete/Manifest
new file mode 100644
index 000000000000..5c18545c0b89
--- /dev/null
+++ b/app-emacs/scheme-complete/Manifest
@@ -0,0 +1,6 @@
+AUX 60scheme-complete-gentoo.el 219 BLAKE2B bf71fafbd85fea667e895ca9dbb91761e4de7f3856d109f3fb1990788ff0f04b66c6edaa835ab681cbfb303d71ec60af8d04d0a1d7e3119c59799c7526903c52 SHA512 52314ed8b643c11fb7058ec5aa8e38e6b9b78800d6daa04b9bdbb9567b4b78c0c804277966c58d69199cab0e5e74d07d9728faab0ff95ba1af65eee7b04eccd2
+DIST scheme-complete-0.8.10.el.gz 38713 BLAKE2B cdb1e821ef752dcb5e1067f636e3b023c114bf564fe44c0e7224c879858d5da51d2ecbfa659d9699f6c7feb1f74dad3462b4ab769e834f2e4b8d9132d4b4a63a SHA512 7058983a57f1fe3cbbc4066f62075b755bd8e9a83ce65bf26a3568889d05abc9972d4b7be57ac54867fc4abe5567e223c9640bd8c898dbc6422d449f41090956
+DIST scheme-complete-0.8.11.el.gz 38847 BLAKE2B 649a4124b0b643211c2132dc0e03e8930ea7f311637b3afd375d75e3aa33abaae888b1aa34744bf22d13738179d4048faa173ec8e5e0868f5789623fb7b11c0c SHA512 90fe73dfee3377f19eca2107deb6c9d88260b2097358416dab5ad839dabc0a0678b7254ab6dbdc058cae2be5feeaa4cba2f66296e49060df5251c1888044fea8
+EBUILD scheme-complete-0.8.10.ebuild 422 BLAKE2B 2a1fc9d9f59ae079de9b6adbbac3746eefb9d2142c56564029e64c914a5527681df356508710b66dea494f1f0f0e0a6cd2c1afd5097d973c8101bf61c26d2472 SHA512 ea4b6cc9e7be6f923b361710022f5d7008938c6e71bdddfc49256ccda0e973e2fbae5823fd5b80814ce1ceb51a9b02885996bce0eb75491b456e4a608c19fa14
+EBUILD scheme-complete-0.8.11.ebuild 414 BLAKE2B 3512807aa52f7df587153ccf86c49a51baab980a2374550b863907505a571cb03c1e1fc3f5a04c45e73b2dddec4525f93e4facf85965d2a9ff8bfd3b1daab491 SHA512 79ccffb1cb1b037041ead7230f6c72dd65e9f81f5232a5749a43f6ef8f52f9bcd1ae35280873409c507bc1cc8d3462387d5942bf84f572f66c86eeceb5d9e692
+MISC metadata.xml 453 BLAKE2B eee674044e30666eb05beaa44a67781bbdf407fdddc1b175e30f7034a0dd6a3efa3c23361d23b47d7bd0076a17b01b8593deedb1524dfc1597b53f94b9ffa0fb SHA512 34268e756461ba2420bf3552b7f73caa9c95f5feef714b09615b295056598f4d7486771fda804320565cf99dd0ad36754d6b966b492f74347a53f4678e12c715
diff --git a/app-emacs/scheme-complete/files/60scheme-complete-gentoo.el b/app-emacs/scheme-complete/files/60scheme-complete-gentoo.el
new file mode 100644
index 000000000000..ab5aee4beaaf
--- /dev/null
+++ b/app-emacs/scheme-complete/files/60scheme-complete-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'scheme-smart-complete "scheme-complete" nil t)
+(autoload 'scheme-complete-or-indent "scheme-complete" nil t)
+(autoload 'scheme-get-current-symbol-info "scheme-complete")
diff --git a/app-emacs/scheme-complete/metadata.xml b/app-emacs/scheme-complete/metadata.xml
new file mode 100644
index 000000000000..1d1c0812c654
--- /dev/null
+++ b/app-emacs/scheme-complete/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ Very smart tab-completion and autodoc for Scheme code in Emacs, complete
+ with type inferencing and lexical environment awareness.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/scheme-complete/scheme-complete-0.8.10.ebuild b/app-emacs/scheme-complete/scheme-complete-0.8.10.ebuild
new file mode 100644
index 000000000000..8fd6adc6b2f8
--- /dev/null
+++ b/app-emacs/scheme-complete/scheme-complete-0.8.10.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Scheme tab-completion and word-completion for Emacs"
+HOMEPAGE="http://synthcode.com/"
+SRC_URI="http://synthcode.com/emacs/${P}.el.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+SITEFILE="60${PN}-gentoo.el"
diff --git a/app-emacs/scheme-complete/scheme-complete-0.8.11.ebuild b/app-emacs/scheme-complete/scheme-complete-0.8.11.ebuild
new file mode 100644
index 000000000000..91767fc5e96e
--- /dev/null
+++ b/app-emacs/scheme-complete/scheme-complete-0.8.11.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Scheme tab-completion and word-completion for Emacs"
+HOMEPAGE="http://synthcode.com/"
+SRC_URI="http://synthcode.com/emacs/${P}.el.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+SITEFILE="60${PN}-gentoo.el"
diff --git a/app-emacs/scim-bridge-el-0.8.2 b/app-emacs/scim-bridge-el-0.8.2
deleted file mode 100644
index 958def1cd18a..000000000000
--- a/app-emacs/scim-bridge-el-0.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=a SCIM-Bridge client for Emacs
-EAPI=5
-HOMEPAGE=https://launchpad.net/scim-bridge.el
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+
-RDEPEND=app-i18n/scim >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://launchpad.net/scim-bridge.el/0.8/0.8.2/+download/scim-bridge-el-0.8.2.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f746a632cae4d4b75d36768825daf800
diff --git a/app-emacs/scim-bridge-el/Manifest b/app-emacs/scim-bridge-el/Manifest
new file mode 100644
index 000000000000..d05dceca61de
--- /dev/null
+++ b/app-emacs/scim-bridge-el/Manifest
@@ -0,0 +1,4 @@
+AUX scim-bridge-el-0.8.2-im-agent.patch 1052 BLAKE2B 4b84943a73ddfc0b30218d27cff86e89294412c9c4a4b2a108283902ac5ab5ec6c300f077482aea79be39c30be39708b9c2d5500dd442118ec22db5c740f6779 SHA512 bded77c74c13d0c0a3a3ba13cb5865d9ecd6abf00ed5d4a0d01e6e482a52211ca3a665a3a8ed5a098e6840b13327a80f9ebc2258023fe5d1b7c1f50693fd527b
+DIST scim-bridge-el-0.8.2.tar.gz 67369 BLAKE2B 453c6d458e9ade8971de1adcceeb10e0d9c6ee7a090a0986cdcf419ec8b2b4422eb8b6ebe1e2a8f3d22330759b2af5e9cc3aac5db37a4d837de9d3d677a9ceff SHA512 2d173acb2d0182cd4c1fb6301cb34de0a5a08f4776e9dcec16bf2d1342bea98765c55d61cb7d666c42c2bb8c63d3083f4d4e59dbbec13a6ec72c7c48350c5c0c
+EBUILD scim-bridge-el-0.8.2.ebuild 541 BLAKE2B 83e0da79950edb018258400ec68ee6e8f94f2f124b6d652bbe8a0732e5f23fda0c0cb9d06df05caef0aa1472c56d91c1d232caba668c3bbe2b4ac3c45bf11b65 SHA512 bc584a655959ef40938431874c3528f0ccae5db5c43936478da0d00188a5785ac1f0d9bc37ac9b843ff3b1be6d5bdbca805cb0a79b4aeb6c61fa38e0c9bba604
+MISC metadata.xml 510 BLAKE2B 55249e3ffff3f3b164cf313e805bf248d11903bb812ddfe12d075eba914321a1e66511417f32b1d420134b3645582129a6c3039a9b8f07d556ac71201a687d40 SHA512 b9f40804261cc6282cf473b77ad7bd938abe6dd19b44d09654ac549544349bfca039f12aa8b3c5cef09298a326dc4fe4f9cdd79582137ea9fdf0856e89e53b1d
diff --git a/app-emacs/scim-bridge-el/files/scim-bridge-el-0.8.2-im-agent.patch b/app-emacs/scim-bridge-el/files/scim-bridge-el-0.8.2-im-agent.patch
new file mode 100644
index 000000000000..678eabdae246
--- /dev/null
+++ b/app-emacs/scim-bridge-el/files/scim-bridge-el-0.8.2-im-agent.patch
@@ -0,0 +1,25 @@
+run against scim-im-agent, after scim-bridge integration into scim.
+
+http://www.scim-im.org/news/scim_news/a_new_stable_version_has_been_released_the_main_change_is_the_incorporation_of_scim_bridge
+--- a/scim-bridge.el
++++ b/scim-bridge.el
+@@ -649,7 +649,7 @@
+ (defvar scim-bridge-compat-version "0.3.0")
+ (defvar scim-bridge-socket-dir "/tmp/")
+ (defvar scim-bridge-socket-name "socket")
+-(defvar scim-bridge-name "scim-bridge")
++(defvar scim-bridge-name "scim-im-agent")
+ (defvar scim-bridge-host-name "localhost")
+ (defvar scim-bridge-socket-path-common
+ (concat scim-bridge-socket-dir scim-bridge-name "-"
+@@ -2485,8 +2485,8 @@
+ (i 0)
+ proc error)
+ (unless (file-exists-p socket)
+- (scim-message "Launch SCIM-Bridge..."))
+- (call-process-shell-command scim-bridge-name nil 0 nil "--noexit")
++ (scim-message "Launch SCIM-Bridge...")
++ (call-process-shell-command scim-bridge-name nil 0 nil "--noexit"))
+ (while (and (not (processp proc))
+ (< i 10)) ; Try connection 10 times at maximum
+ (sleep-for (* 0.1 i))
diff --git a/app-emacs/scim-bridge-el/metadata.xml b/app-emacs/scim-bridge-el/metadata.xml
new file mode 100644
index 000000000000..43c14ac67d16
--- /dev/null
+++ b/app-emacs/scim-bridge-el/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>heroxbd@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ A SCIM-Bridge client for Emacs.
+</longdescription>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="launchpad">scim-bridge.el</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/scim-bridge-el/scim-bridge-el-0.8.2.ebuild b/app-emacs/scim-bridge-el/scim-bridge-el-0.8.2.ebuild
new file mode 100644
index 000000000000..d65a356fb331
--- /dev/null
+++ b/app-emacs/scim-bridge-el/scim-bridge-el-0.8.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit elisp versionator
+
+MY_PN=${PN/-el/.el}
+MY_BR=$(get_version_component_range 1-2)
+DESCRIPTION="a SCIM-Bridge client for Emacs"
+HOMEPAGE="https://launchpad.net/scim-bridge.el"
+SRC_URI="https://launchpad.net/${MY_PN}/${MY_BR}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-i18n/scim"
+
+src_prepare () {
+ epatch "${FILESDIR}"/${PN}-0.8.2-im-agent.patch
+}
diff --git a/app-emacs/scss-mode-20130215 b/app-emacs/scss-mode-20130215
deleted file mode 100644
index 07c529a33c9a..000000000000
--- a/app-emacs/scss-mode-20130215
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=dev-ruby/sass >=virtual/emacs-23
-DESCRIPTION=Major mode for editing SCSS files in Emacs
-EAPI=4
-HOMEPAGE=https://github.com/antonj/scss-mode
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/antonj/scss-mode/archive/3452e92800c345690195f55a74ba4118c5c4d004.tar.gz -> scss-mode-20130215-git.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=6772d534b6630f63890d4b1a043b76fb
diff --git a/app-emacs/scss-mode-20150107 b/app-emacs/scss-mode-20150107
deleted file mode 100644
index b2fdfbe36a09..000000000000
--- a/app-emacs/scss-mode-20150107
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=dev-ruby/sass >=virtual/emacs-23
-DESCRIPTION=Major mode for editing SCSS files in Emacs
-EAPI=5
-HOMEPAGE=https://github.com/antonj/scss-mode
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/antonj/scss-mode/archive/b010d134f499c4b4ad33fe8a669a81e9a531b0b2.tar.gz -> scss-mode-20150107-git.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=cad1c8757e7d3264459320be90051a21
diff --git a/app-emacs/scss-mode/Manifest b/app-emacs/scss-mode/Manifest
new file mode 100644
index 000000000000..90a52d6c6a10
--- /dev/null
+++ b/app-emacs/scss-mode/Manifest
@@ -0,0 +1,6 @@
+AUX 50scss-mode-gentoo.el 161 BLAKE2B bbe35fe0ab2a4857ad2ab3fa6866e39f873c9c32fec93eb321de9fbb20128be2fb49d36028f778217f4199603a5d5be8e4d1932a5799173b92768ec7b80c0f16 SHA512 099fe31e6a15247502498b3e27e8e462b0ca08b719becc8c22e3e6877aafa1987934b68e916cd2be1237fccda2bdd550402fd168c28967721ce472a033a61a7d
+DIST scss-mode-20130215-git.tar.gz 2632 BLAKE2B f73ad6ee5120518c6e083cc5c963601649866a826e0bf5628f90a1c1e952c36b66a7f1a385244b71d0f78f958edf1d39142aabd309af380a650f5205a1300ba3 SHA512 2241d7e0c2689ba3997e4ffdf1ed167409c1d99a4f6a11911de39775a409d3299ba7e1bb2f7f0878b5b0d91e46706b65ef8e25cef83278894d8842af8bbc95be
+DIST scss-mode-20150107-git.tar.gz 2718 BLAKE2B 5551ca7258caf22957e1d3becf147cfb617378c606c05196b87fa2ce7b035f06e48db1ad01476bcca87bde461971ab040fc7085422cd076469c6d7a9b73b624a SHA512 68a33d14166289af119625a5609c4dec47a05eb8c8452b42cf8e819368cc7561270c8223ac0624fee989f8c51592f456f91009c153fb857549d9c7e7c7e801a2
+EBUILD scss-mode-20130215.ebuild 521 BLAKE2B 5a0da27b242f938a5062bdc31925122cdfe019874ab0e34a924add392b899e675eb738eb24b5247dc0b38f53646547ff9dd7e4a06324a7907fb9f0a3062809b1 SHA512 e226eb79a179878b930dba4c85562580b562b8d06ed0c210a64531c22f7a34917fbce93b87b7c3e9f5227917e479835d8abe629e02d4888c99a28f09999bc2c4
+EBUILD scss-mode-20150107.ebuild 521 BLAKE2B fb253ab30ecd7ea705e1b20d34bc4f5b65c9db685422e4d746465b8a9afae54072dea8e210b79df9a42f31f1236363f5e78a3c3902be3ab0f797b863c7924002 SHA512 a258b0f13e1468f110164354f62dfc6cb64c21525105ed695cf0a5866ad42f1ffcbf7b9b2088f8d1ed700056e9bd72f98b7bd9fec30c82f35c01fa3035cc9fce
+MISC metadata.xml 361 BLAKE2B 71d6b259ce979cdcf349de35893a68db5a895e4ebb12379fe98e1bd0d7eb6f193b128659418254f3fd31071c6e2d4f8604127297cb0474831658ccbbe1c87e11 SHA512 8178cf34cff42d3d4320190b5a93c52a6387d1732459e00edbe304bc9ff585eec4b5917fa56b6a345c51fea0bb587cdf88ab816b50ee47010f039ee5943cef67
diff --git a/app-emacs/scss-mode/files/50scss-mode-gentoo.el b/app-emacs/scss-mode/files/50scss-mode-gentoo.el
new file mode 100644
index 000000000000..ac09f6c30786
--- /dev/null
+++ b/app-emacs/scss-mode/files/50scss-mode-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'scss-mode "scss-mode" "Simple mode to edit SCSS." t)
+(add-to-list 'auto-mode-alist '("\\.scss\\'" . scss-mode))
diff --git a/app-emacs/scss-mode/metadata.xml b/app-emacs/scss-mode/metadata.xml
new file mode 100644
index 000000000000..5b7830ee1fd1
--- /dev/null
+++ b/app-emacs/scss-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">antonj/scss-mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/scss-mode/scss-mode-20130215.ebuild b/app-emacs/scss-mode/scss-mode-20130215.ebuild
new file mode 100644
index 000000000000..06f928f8b652
--- /dev/null
+++ b/app-emacs/scss-mode/scss-mode-20130215.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+GITHUB_SHA1=3452e92800c345690195f55a74ba4118c5c4d004
+
+DESCRIPTION="Major mode for editing SCSS files in Emacs"
+HOMEPAGE="https://github.com/antonj/scss-mode"
+SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}-git.tar.gz"
+S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DOCS="README.org"
+SITEFILE="50${PN}-gentoo.el"
+
+DEPEND="dev-ruby/sass"
diff --git a/app-emacs/scss-mode/scss-mode-20150107.ebuild b/app-emacs/scss-mode/scss-mode-20150107.ebuild
new file mode 100644
index 000000000000..4641fb9938a7
--- /dev/null
+++ b/app-emacs/scss-mode/scss-mode-20150107.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+GITHUB_SHA1=b010d134f499c4b4ad33fe8a669a81e9a531b0b2
+
+DESCRIPTION="Major mode for editing SCSS files in Emacs"
+HOMEPAGE="https://github.com/antonj/scss-mode"
+SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}-git.tar.gz"
+S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DOCS="README.org"
+SITEFILE="50${PN}-gentoo.el"
+
+DEPEND="dev-ruby/sass"
diff --git a/app-emacs/semi-1.14.6-r2 b/app-emacs/semi-1.14.6-r2
deleted file mode 100644
index ef1bdbe63eaf..000000000000
--- a/app-emacs/semi-1.14.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/apel-10.6 virtual/emacs-flim >=virtual/emacs-23
-DESCRIPTION=A library to provide MIME feature for GNU Emacs
-EAPI=5
-HOMEPAGE=http://git.chise.org/elisp/semi/
-IUSE=l10n_ja
-KEYWORDS=alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=>=app-emacs/apel-10.6 virtual/emacs-flim >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://git.chise.org/elisp/dist/semi/semi-1.14-for-flim-1.14/semi-1.14.6.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c313275b501818bebe688ffb0a9e917c
diff --git a/app-emacs/semi/Manifest b/app-emacs/semi/Manifest
new file mode 100644
index 000000000000..5656626d19ab
--- /dev/null
+++ b/app-emacs/semi/Manifest
@@ -0,0 +1,5 @@
+AUX 65semi-gentoo.el 60 BLAKE2B 19bc99330e4583e19060bba3722f73da5a5e232e0e60673ba21c3b02dd3429098685313380f788bbce5a23c98618f2adc22115a1b47abe2969c25db3d8b6716a SHA512 a8441acdfac8f82dfa65e796e39dd77ce5ff7569e0deb930d31c7c90ce7ccd4be138f51a4866a1036ea6234c6419e548a5df74fc932cb5b588dd99acc2c2d314
+AUX semi-info.patch 1009 BLAKE2B 936ce69c254eca176f7bdbaae92dcda7fe921214b1d089ce8bbdf9d05fad0872ae2c3e1978c6c60663539d427f863f225cb11d604de80c0fe5d2f0bfb4898365 SHA512 d3e3700f8bc19e48d7a5ec419d7a1f5e5683fe18e6097b52d47f73dee47624b095e3dae4a064b023a6ad2cf5d84705aefa04f94ff85aa9a854c1d9cf3dc7f052
+DIST semi-1.14.6.tar.gz 142549 BLAKE2B e417b305ad814b2a23fad4fd37057395efb47bdb61778aa167149eda4277cda47dc81148821d9e4ad3225a858c77f781a6565c3e49747d78882b9401fd5fbac1 SHA512 1011271c58414f4ca23da079f16f273b408643e0d9f4961db321b65c1ed9a7d4ca66a7d7cb5b0c9fa2b4904fa992c9188858de6131180ee30132d3cadaeef33f
+EBUILD semi-1.14.6-r2.ebuild 1304 BLAKE2B 9e8de8281fc0c46440ee957baf9d73e73a0926e45f638d800dede6b94f98e2d81d8e951a3ae4886695770b7908f0442894fdee87b4595f0313773b5bc414e668 SHA512 8cbaee733cd898381063722b48502842fb8d3113a95b6416479e234a0b966eb5cd6212edf736bb900a7972d6885998e03ac27d0d5dafd41b1dd799642781a33c
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/semi/files/65semi-gentoo.el b/app-emacs/semi/files/65semi-gentoo.el
new file mode 100644
index 000000000000..785c9bdd420d
--- /dev/null
+++ b/app-emacs/semi/files/65semi-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'mime-setup)
diff --git a/app-emacs/semi/files/semi-info.patch b/app-emacs/semi/files/semi-info.patch
new file mode 100644
index 000000000000..7a585bcab35b
--- /dev/null
+++ b/app-emacs/semi/files/semi-info.patch
@@ -0,0 +1,30 @@
+diff -urN semi-1.14.6.orig/mime-ui-en.texi semi-1.14.6/mime-ui-en.texi
+--- semi-1.14.6.orig/mime-ui-en.texi 2002-10-15 15:59:21.000000000 +0900
++++ semi-1.14.6/mime-ui-en.texi 2004-08-21 02:31:44.479200664 +0900
+@@ -6,6 +6,11 @@
+ @author MORIOKA Tomohiko <morioka@@jaist.ac.jp>
+ @subtitle 1998/07/03
+ @end titlepage
++@dircategory GNU Emacs Lisp
++@direntry
++* Semi-en: (mime-ui-en). MIME user interface for GNU Emacs.
++@end direntry
++
+ @node Top, Introduction, (dir), (dir)
+ @top SEMI 1.14 Manual
+
+diff -urN semi-1.14.6.orig/mime-ui-ja.texi semi-1.14.6/mime-ui-ja.texi
+--- semi-1.14.6.orig/mime-ui-ja.texi 2002-10-15 15:59:21.000000000 +0900
++++ semi-1.14.6/mime-ui-ja.texi 2004-08-21 02:31:33.727835120 +0900
+@@ -6,6 +6,11 @@
+ @author 蕾ぢ知彦 <morioka@@jaist.ac.jp>
+ @subtitle 1998/07/03
+ @end titlepage
++@dircategory GNU Emacs Lisp
++@direntry
++* Semi-ja: (mime-ui-ja). MIME user interface for GNU Emacs.
++@end direntry
++
+ @node Top, Introduction, (dir), (dir)
+ @top SEMI 1.14 説明書
+
diff --git a/app-emacs/semi/metadata.xml b/app-emacs/semi/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/semi/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/semi/semi-1.14.6-r2.ebuild b/app-emacs/semi/semi-1.14.6-r2.ebuild
new file mode 100644
index 000000000000..5555c415b5d7
--- /dev/null
+++ b/app-emacs/semi/semi-1.14.6-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp eutils
+
+DESCRIPTION="A library to provide MIME feature for GNU Emacs"
+HOMEPAGE="http://git.chise.org/elisp/semi/"
+SRC_URI="http://git.chise.org/elisp/dist/${PN}/${P%.*}-for-flim-1.14/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="l10n_ja"
+
+DEPEND=">=app-emacs/apel-10.6
+ virtual/emacs-flim"
+RDEPEND="${DEPEND}"
+
+ELISP_PATCHES="${PN}-info.patch"
+SITEFILE="65${PN}-gentoo.el"
+
+src_compile() {
+ emake PREFIX="${ED}"/usr \
+ LISPDIR="${ED}/${SITELISP}" \
+ VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}"
+
+ ${EMACS} ${EMACSFLAGS} --visit mime-ui-en.texi -f texi2info \
+ || die "texi2info failed"
+ if use l10n_ja; then
+ ${EMACS} ${EMACSFLAGS} \
+ --eval "(set-default-coding-systems 'iso-2022-jp)" \
+ --visit mime-ui-ja.texi -f texi2info \
+ || die "texi2info failed"
+ fi
+}
+
+src_install() {
+ emake PREFIX="${ED}/usr" \
+ LISPDIR="${ED}/${SITELISP}" \
+ VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" install
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ doinfo mime-ui-en.info
+ dodoc README.en ChangeLog VERSION NEWS
+ if use l10n_ja; then
+ doinfo mime-ui-ja.info
+ dodoc README.ja
+ fi
+}
diff --git a/app-emacs/session-2.3a b/app-emacs/session-2.3a
deleted file mode 100644
index a699c7be2ea6..000000000000
--- a/app-emacs/session-2.3a
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=When you start Emacs, Session restores various variables from your last session
-EAPI=5
-HOMEPAGE=http://emacs-session.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://sourceforge/emacs-session/session-2.3a.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=88c23321f526464402bec92e8090401a
diff --git a/app-emacs/session/Manifest b/app-emacs/session/Manifest
new file mode 100644
index 000000000000..3976713b03d8
--- /dev/null
+++ b/app-emacs/session/Manifest
@@ -0,0 +1,4 @@
+AUX 50session-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST session-2.3a.tar.gz 26648 BLAKE2B 6380e9c31c37afc99229bbe63ce86f0e80340e093c9ec859adbc688e10e8e6f9b40153344fe02336e9336dcbc7c40e0a2337d82a90d0a40f161b5e4b062988a7 SHA512 eb0721c780256ca5dfcdf5071d73a89e3e7e477bbe2ddc380adaf7a7cbf870bbc0e334192f59362df93571ff91063d53df918761322e31d7c6ffa8059d4bc15a
+EBUILD session-2.3a.ebuild 634 BLAKE2B bce709f072f9a3b988707117914f21e737a7f72e2136b41d2b555e09092b4eb3e6f5a790af309a1a1aeef05bfde8f82a0bcb05e1ba8b4ea71f50b8de4465bcc7 SHA512 9e93e4950902c675a456cd18418c6c48546eab2e696f47817f16116aee0295e33ab5904f05a12ba597067c28cba75ecfe8fc5c89197aba577cb3884832036016
+MISC metadata.xml 363 BLAKE2B 4957fd40e9e3161aad4fb8784651fb49b64a8befdb8734944a75a5b4d3987cec07fcb951582b871eb382cc4270dda606ea8df2b72cfd0856468813091efb0f41 SHA512 cb7cd548a5fb5f36b2b3bab8eee175bb21903d2baefa4230806812a6281a5860b31afe0bde4345cb4e1f3918601a795ee0906ef22e2fbd2f5f7a03618c7210d5
diff --git a/app-emacs/session/files/50session-gentoo.el b/app-emacs/session/files/50session-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/session/files/50session-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/session/metadata.xml b/app-emacs/session/metadata.xml
new file mode 100644
index 000000000000..5a0fa89050f9
--- /dev/null
+++ b/app-emacs/session/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">emacs-session</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/session/session-2.3a.ebuild b/app-emacs/session/session-2.3a.ebuild
new file mode 100644
index 000000000000..1652c1126531
--- /dev/null
+++ b/app-emacs/session/session-2.3a.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+DESCRIPTION="When you start Emacs, Session restores various variables from your last session"
+HOMEPAGE="http://emacs-session.sourceforge.net/"
+SRC_URI="mirror://sourceforge/emacs-session/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+S="${WORKDIR}/${PN}/lisp"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="../INSTALL ../README ChangeLog"
+DOC_CONTENTS="Add the following to your ~/.emacs to use session:
+ \n\t(require 'session)
+ \n\t(add-hook 'after-init-hook 'session-initialize)"
diff --git a/app-emacs/setnu-1.06 b/app-emacs/setnu-1.06
deleted file mode 100644
index 619ac7105cb5..000000000000
--- a/app-emacs/setnu-1.06
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Display line numbers in Emacs buffers
-EAPI=5
-HOMEPAGE=http://www.wonderworks.com/ https://www.emacswiki.org/emacs/LineNumbers
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/setnu-1.06.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=98e5281c80d21620565645931af2c3c3
diff --git a/app-emacs/setnu/Manifest b/app-emacs/setnu/Manifest
new file mode 100644
index 000000000000..8564525bd8b0
--- /dev/null
+++ b/app-emacs/setnu/Manifest
@@ -0,0 +1,4 @@
+AUX 50setnu-gentoo.el 157 BLAKE2B 88991e40d47f1b27deb2bfd8afe20611489052c439f4f2cceef3be7b93c0be955a0f835171e173f3e4367d11f926da4bd52b5a5a768bceeb1c154938c7ac51e7 SHA512 f94345c009d3120f7d879abbceb949dd506b677228a7b40af69751398867290ff27b8b287aac1c06f4a25cbd7d3ea68b1460fdcf08fc31f3df3fcb3ed7e64ec5
+DIST setnu-1.06.tar.gz 4488 BLAKE2B a549e5e43c47276b5110059002609a1de36198e7b2f53f101689f3b4df952190197b9b77602eb78ceb6b19d3386043aade8b214bdae656a487eea51f95495c0f SHA512 84ff5ba3da8c8d1c205f251ac408ff1f5b1368d5a418826dbe55e86e26e8dd9ea9a65d89c3432d45126adc2b4e6ed7b210b2c1bfe6abe38d77aba76a85d2792e
+EBUILD setnu-1.06.ebuild 388 BLAKE2B 7aa5723ce4f95c261fd0657aa5ea3207172611200e52e977bbb5ef1851b03559322b98e82d04d4a3583bd0de44b317c1d77efead8a8ee4d4214ea18fe61c63a4 SHA512 9d97380bac204e4daf8d39d49a0bd1c4a0f35d1f27d1bf12b0b82b635a5b1851c85ab657a046b02d810d870f3da0816900b7f7e4c6c4588ac47cae799d630e96
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/setnu/files/50setnu-gentoo.el b/app-emacs/setnu/files/50setnu-gentoo.el
new file mode 100644
index 000000000000..8af7133ade6e
--- /dev/null
+++ b/app-emacs/setnu/files/50setnu-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'setnu-mode "setnu" "Toggle setnu-mode." t)
+(autoload 'turn-on-setnu-mode "setnu" "Turn on setnu-mode." nil)
diff --git a/app-emacs/setnu/metadata.xml b/app-emacs/setnu/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/setnu/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/setnu/setnu-1.06.ebuild b/app-emacs/setnu/setnu-1.06.ebuild
new file mode 100644
index 000000000000..2e24e4a69655
--- /dev/null
+++ b/app-emacs/setnu/setnu-1.06.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Display line numbers in Emacs buffers"
+HOMEPAGE="http://www.wonderworks.com/
+ https://www.emacswiki.org/emacs/LineNumbers"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/slime-2.15 b/app-emacs/slime-2.15
deleted file mode 100644
index d88baa5873cd..000000000000
--- a/app-emacs/slime-2.15
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/commonlisp dev-lisp/asdf >=sys-apps/texinfo-5.1 doc? ( virtual/texi2dvi ) >=virtual/emacs-23
-DESCRIPTION=SLIME, the Superior Lisp Interaction Mode (Extended)
-EAPI=5
-HOMEPAGE=http://common-lisp.net/project/slime/
-IUSE=doc xref
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-2 xref? ( xref.lisp )
-PDEPEND=virtual/commonlisp
-RDEPEND=virtual/commonlisp dev-lisp/asdf >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/slime/slime/archive/v2.15.tar.gz -> slime-2.15.tar.gz
-_eclasses_=common-lisp-3 3f23602a5efddf587c5205de7b6de7f8 desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=98c79f3f2a6acba7af7899fb46c6e6ec
diff --git a/app-emacs/slime-2.20 b/app-emacs/slime-2.20
deleted file mode 100644
index 1816812c0143..000000000000
--- a/app-emacs/slime-2.20
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/commonlisp dev-lisp/asdf >=sys-apps/texinfo-5.1 doc? ( virtual/texi2dvi ) >=virtual/emacs-23
-DESCRIPTION=SLIME, the Superior Lisp Interaction Mode (Extended)
-EAPI=6
-HOMEPAGE=http://common-lisp.net/project/slime/
-IUSE=doc xref
-KEYWORDS=amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2 xref? ( xref.lisp )
-RDEPEND=virtual/commonlisp dev-lisp/asdf >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/slime/slime/archive/v2.20.tar.gz -> slime-2.20.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=71fab08a56bba930e1b4c43108ccda3b
diff --git a/app-emacs/slime-2.20-r1 b/app-emacs/slime-2.20-r1
deleted file mode 100644
index f4d215a49bd1..000000000000
--- a/app-emacs/slime-2.20-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/commonlisp dev-lisp/asdf >=sys-apps/texinfo-5.1 doc? ( virtual/texi2dvi ) >=virtual/emacs-23
-DESCRIPTION=SLIME, the Superior Lisp Interaction Mode (Extended)
-EAPI=6
-HOMEPAGE=http://common-lisp.net/project/slime/
-IUSE=doc xref
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2 xref? ( xref.lisp )
-RDEPEND=virtual/commonlisp dev-lisp/asdf >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/slime/slime/archive/v2.20.tar.gz -> slime-2.20.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=0f0983bcef5b74f09cde1319baf3ed0c
diff --git a/app-emacs/slime-2.21 b/app-emacs/slime-2.21
deleted file mode 100644
index 7a3248dc96e1..000000000000
--- a/app-emacs/slime-2.21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/commonlisp dev-lisp/asdf >=sys-apps/texinfo-5.1 doc? ( virtual/texi2dvi ) >=virtual/emacs-23
-DESCRIPTION=SLIME, the Superior Lisp Interaction Mode (Extended)
-EAPI=6
-HOMEPAGE=http://common-lisp.net/project/slime/
-IUSE=doc xref
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2 xref? ( xref.lisp )
-RDEPEND=virtual/commonlisp dev-lisp/asdf >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/slime/slime/archive/v2.21.tar.gz -> slime-2.21.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=cfa0ecee09b801e6edc00e600cac08e1
diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
new file mode 100644
index 000000000000..912e6615e228
--- /dev/null
+++ b/app-emacs/slime/Manifest
@@ -0,0 +1,18 @@
+AUX 2.0_p20110617/70slime-gentoo.el 573 BLAKE2B 4d9908cfc43a18aad633eca7e9164c3d4506c7ed3af5551600b291ff8f781d19198b7a38125dc024f9c0a844ff0594868b416474eeb0bfe87f9e47c0ab9380ce SHA512 022e0934c8dcdf208bdfed9810200c8b925059b75e87697760b7e8cc926569da607dc3b723988e1ec49d584c92cdea96afd46642090743e4e593c860a058523f
+AUX 2.0_p20110617/gentoo-dont-call-init.patch 638 BLAKE2B f844d294562f59cf72651929a1ff35ce90ca7097ff804c874b752f2c4a540f538078f7fc4545079bd72ed2d24e482a15edd5a6d8d95764c7da9b394a1ebfe4d3 SHA512 b99e0dc55e61fda9f21bca9661854b84166834b4330e5f46b10bfd2c3fb61f092046fe8553fdf2d7a7a6350adcd3827315ea681bb53a3ebfec3648b25ac72b84
+AUX 2.0_p20110617/swank.asd 4348 BLAKE2B eeebe2b694b42e2aa30dfd08d1e86f4164369b44676785e47f37a38be536188164ba67fd1345a4eda7f419f6fa45dda6d4fd9df48df58d752496cd6a3d3d9a9c SHA512 323461a64953c4bd1ca94d68f6a36103c518c69938a205870cd1dcbeb0e3bccc6221a58bf8079ae5c7d17afe06c6732838cc3b2e418ca5dc225603ad3d309479
+AUX 2.0_p20130214/gentoo-module-load.patch 3253 BLAKE2B 2b404f6bdbbd11a271fb8903312f6ac62cb60c3293fbd8f7732c5d965104414812e93995777b354db6a0f88f3390e1d7e3939131cded64d8e3fa7f5a7844a543 SHA512 6489627fad7ab80102b7127bc5e70f74856e0685fbbe4ae92a779f65425b30472ff554cce05e102d2fe652e8216ddcd0f51393651aa3818865a90a215417fcad
+AUX 2.11/dont-load-sbcl-pprint.patch 556 BLAKE2B feb05a884c8fa088efec7907405dfcf9abaf4c02d44bd35d1e4e319eda3186b2a2ab3bb04b828bf8a868ab922de3c1857134cf9f7ed2eba56b0ef7e86158e7ad SHA512 5c0e49aad96da70c74cfda79e8d0654d87ee4996245a22f914ad75902e4acb1315a0c455920a27ca11a15465f8ebbd389655afc5083b0212d16b8541db4f88f4
+AUX 2.11/gentoo-changelog-date.patch 803 BLAKE2B 0adbe6e88ef0470d27ffe8ae4e18d86ed5dcdb062026bdaec6966609d167530e21a439fc3465274cd5b578b29a2ac48e08ac314789cd060b7456a48fae443b72 SHA512 ae0f07c74988733a070bfd3ca4192ab3de7ebd5bab4705e6419f17986a833a35e0e4f84dad6c0e16cb051eb5ca612ae958a73f3cde327416eb4726a8139ac4b5
+AUX 2.15/gentoo-changelog-date.patch 790 BLAKE2B acb85ec980c299eef7bff5f766b0674a38695549f86af8df5d3e87b3fc62943a364fba5e1d87faec251ee9c11ba19ff1dac6ac790a1acd25338fb062ab68269f SHA512 f5dd64feccd905d92743135dec9158e258f3bbae06032ab2059878701d9c308416e355ef2a9d01113df8a4763f4d2ce3d15d42e6ed36470065de079c495ca057
+AUX 70slime-gentoo.el 526 BLAKE2B 6bfd25cf1ef661ac1510d6862d8eea832d1de11d173d7a4c1fc6f12c204c13b641382a23b196c21ad6a4825b620c69244764db65e94060e4b636c5b6702e871c SHA512 94c84b4a91cad91f553c22cc9d61cb6a77aa0dd723571770159237e7d3e6f2ec0e3dc0a3e139a99bd820da67d019891db1e84d384fb96614f086b54e9bd5769e
+AUX slime-2.20-fix-doc-build.patch 3547 BLAKE2B 10c45bfe0c638080373071d3c357f9dbb1161804b172259a0763d69ce41ac3cf1c9d3156f6379ba542d23b977b9698fbb17d9f4ca4825549c6639927a568fbca SHA512 3c8b762a6512c9558743bac4fc1b3804472fe637e44bd255e5c69e2221cc053e1a9099e9ce829f4935911b91ecb1f6fe1e6629ebc9e389e8ddbbd9b1366b1354
+AUX swank-loader.lisp 68 BLAKE2B 6cc412c9e0d5357835741486c7c26dd58edaef9d8a4544bf9f3cb416973e76a2e5456d86bf930a66ae60ddbf637523537914fe43a7d5c3793877b194df63ad90 SHA512 2d4c86b5ed9e19268356e6cc97a3693b005f20e40d16a94f4df99953108ce21ee46db6c951218bedb5ec34b086835476424af1ed863989bcd18a9123d03982a7
+DIST slime-2.15.tar.gz 1072190 BLAKE2B 7623d2d109486e35cb94a3bd8a6b72008c28fbc0bac5bdbcde5fcde19b2ebc74d488a6ff67f026922ea716e67ac732cc72f7b984cc4c2574f57323db93de300c SHA512 15f943981e35995b225b168a3d1c2099f7205c2ff359fa209f164464caf05f9fab4d24906442d94ddeb4222f7116d09a832c7377baf95fbe02d6a98a721fd611
+DIST slime-2.20.tar.gz 803127 BLAKE2B 9a6e50d50da4c9f8f2226ec919cf7f2068ae93a0bac0301233c2d75f12e94e3345998093880d7836fab07d8541da86de928308cfe571ee5811da6de9bfa11b31 SHA512 994dbffb54ee1ab4ca529771451724c83ff83992a6d495e06cdca5cd94f0c098e48d7914489278e3015f18ea094d58c469e57301492087a33087562f69506b46
+DIST slime-2.21.tar.gz 810610 BLAKE2B d5126e60fb04af2c712426dc9b701cfcabb04a16ab4df6ee138c9f77280fa892e608a04f1af1154b42f7063cc85464146e9a9b10f2a223b5d8015ed49eb1ee1c SHA512 6cc0d865bda2b1a4d806564e4e7d0c9cff739aba16d21ffd47c6a7353e45d332506014ba54f6a0fcfbc97d4c2d3d864f02c2d144cd4d8d06b9b19dafa8f8be3c
+EBUILD slime-2.15.ebuild 3809 BLAKE2B 17727a8c2ed4f026ac4578d6bc3f7631c02108bb7c982da9b06d93033caf352153cd227637f52fbaba9e8093b55ae45b84dd60e0af1efc67cbafb3570f187fd9 SHA512 fc7afdef43a6815f4af457064e8fea8b8b2dc50791efd9956d5b5b2b281bbb8c6554bac454785dc5762f631cc427c0d23add2085c661803f9e8ef655bb6eee79
+EBUILD slime-2.20-r1.ebuild 1832 BLAKE2B 616eda3d92ec1710f26de61e05bbea0b88fd2c3b3e1587a1511ed9fba75b16b544728d018c789219d1ef8223f57aa4b1664b25a4a3502d2c3dae0640139e20d2 SHA512 26fdca6c0d661219ec94e112e21ca4688915da1a3f33d7ec2f8e8cb7fbc99766518b16021c6a0f1d5c305823ff94472c44b24a53dd8758b43aae3f4afce00245
+EBUILD slime-2.20.ebuild 1740 BLAKE2B d762c6475376871762197c2f2c3aa8a4800991cebc67467c6696b96f6bc6e370f9a5f65d1479dae0e522a97f62e3533a4a72228dd724c9e58f50278ed5906dcc SHA512 793859aa3874accd77810f27ec116a9e52c82d88d77c9b86212422b4084cc6a28cb7a99744a9fd0244519a8e2f60621afea059cbb2e1425ab5126a61cf9dcbf2
+EBUILD slime-2.21.ebuild 1728 BLAKE2B 932901636fe16f54486ba3b3e14b18eafcc8cdfd5b527acd2a3306a4e6e1dd6e9f83244348af3efa5b8d8b27aaa6a842503d64aa8c4666e902f9ef056ced2d90 SHA512 874e8b94c213d23446410b0c2e10f6d96a08a62baaf75dba01e30083c26f38b0cb54e6ca8221ac1e004830f10362072fe318f4ca44dba5e5d2e38cd42961e881
+MISC metadata.xml 1681 BLAKE2B b064702addc588a618896d83ab0e20a5b867972621473b97dc131a9b3f4c9305576323084130fc181c5f260cd46ae042f719e9956f414a3ba7c1c9d677f0f6b0 SHA512 0387efe8e517d3dab2a609bd63a914b264dfd922e1e985aabe958f4dbe45d7effdafd15b9ca1d2a63cd269f25d36b01524af542e9203b28e64044a47a9d7d5da
diff --git a/app-emacs/slime/files/2.0_p20110617/70slime-gentoo.el b/app-emacs/slime/files/2.0_p20110617/70slime-gentoo.el
new file mode 100644
index 000000000000..358af67d918d
--- /dev/null
+++ b/app-emacs/slime/files/2.0_p20110617/70slime-gentoo.el
@@ -0,0 +1,15 @@
+;;; site-lisp configuration for SLIME
+
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'load-path "@SITELISP@/contrib")
+(autoload 'slime-highlight-edits-mode "slime-highlight-edits")
+
+(require 'slime-autoloads)
+(slime-setup '(slime-fancy slime-asdf slime-banner))
+
+;; this allows us not to require dev-lisp/hyperspec
+;; (which is non-free) as a hard dependency
+(setq common-lisp-hyperspec-root
+ (if (file-exists-p "/usr/share/doc/hyperspec/HyperSpec")
+ "file:///usr/share/doc/hyperspec/HyperSpec/"
+ "http://www.lispworks.com/reference/HyperSpec/"))
diff --git a/app-emacs/slime/files/2.0_p20110617/gentoo-dont-call-init.patch b/app-emacs/slime/files/2.0_p20110617/gentoo-dont-call-init.patch
new file mode 100644
index 000000000000..410c3913a2a1
--- /dev/null
+++ b/app-emacs/slime/files/2.0_p20110617/gentoo-dont-call-init.patch
@@ -0,0 +1,16 @@
+Author: Stelian Ionescu <sionescu@cddr.org>
+Date: 2010-05-14
+Status: Gentoo-only
+Description: Dont' call SWANK-LOADER:INIT on startup since we don't use
+ the upstream swank-loader.lisp
+
+--- a/slime.el
++++ b/slime.el
+@@ -1323,7 +1323,6 @@ See `slime-start'."
+ `(progn
+ (load ,(slime-to-lisp-filename (expand-file-name loader))
+ :verbose t)
+- (funcall (read-from-string "swank-loader:init"))
+ (funcall (read-from-string "swank:start-server")
+ ,(slime-to-lisp-filename port-filename)
+ :coding-system ,encoding)))))
diff --git a/app-emacs/slime/files/2.0_p20110617/swank.asd b/app-emacs/slime/files/2.0_p20110617/swank.asd
new file mode 100644
index 000000000000..b33ca6e67cb0
--- /dev/null
+++ b/app-emacs/slime/files/2.0_p20110617/swank.asd
@@ -0,0 +1,98 @@
+;;;; -*- Mode: Lisp; indent-tabs-mode: nil -*-
+
+(defpackage #:swank-system
+ (:use #:common-lisp #:asdf))
+
+(in-package #:swank-system)
+
+(defun load-user-init-file ()
+ "Load the user init file, return NIL if it does not exist."
+ (load (merge-pathnames (user-homedir-pathname)
+ (make-pathname :name ".swank" :type "lisp"))
+ :if-does-not-exist nil))
+
+(defun load-site-init-file ()
+ (load (make-pathname :name "site-init" :type "lisp"
+ :defaults (truename
+ (asdf:system-definition-pathname
+ (asdf:find-system :swank))))
+ :if-does-not-exist nil))
+
+(defclass no-load-file (cl-source-file) ())
+
+(defmethod perform ((op load-op) (c no-load-file)) nil)
+
+(defmacro define-swank-system (sysdep-files)
+ `(defsystem :swank
+ :description "Swank is the Common Lisp back-end to SLIME"
+ :serial t
+ :components ((:file "swank-backend")
+ (:file "nregex")
+ ,@(mapcar #'(lambda (component)
+ (if (atom component)
+ (list :file component)
+ component))
+ sysdep-files)
+ (:file "swank-match")
+ (:file "swank-rpc")
+ (:file "swank")
+ (:module "contrib"
+ :components ((:no-load-file "swank-c-p-c")
+ (:no-load-file "swank-arglists"
+ :depends-on ("swank-c-p-c"))
+ (:no-load-file "swank-asdf")
+ (:no-load-file "swank-clipboard")
+ (:no-load-file "swank-fancy-inspector")
+ (:no-load-file "swank-fuzzy"
+ :depends-on ("swank-c-p-c"))
+ (:no-load-file "swank-hyperdoc")
+ (:no-load-file "swank-indentation")
+ (:no-load-file "swank-listener-hooks")
+ (:no-load-file "swank-media")
+ (:no-load-file "swank-motd")
+ (:no-load-file "swank-package-fu")
+ (:no-load-file "swank-presentations")
+ (:no-load-file "swank-presentation-streams"
+ :depends-on ("swank-presentations"))
+ (:no-load-file "swank-sbcl-exts"
+ :depends-on ("swank-arglists"))
+ (:no-load-file "swank-snapshot")
+ (:no-load-file "swank-sprof"))))
+ :depends-on (#+sbcl sb-bsd-sockets)
+ :perform (load-op :after (op swank)
+ (load-site-init-file)
+ (load-user-init-file))))
+
+#+(or cmu scl sbcl openmcl clozurecl lispworks allegro clisp armedbear cormanlisp ecl)
+(define-swank-system
+ #+cmu (swank-source-path-parser swank-source-file-cache swank-cmucl)
+ #+scl (swank-source-path-parser swank-source-file-cache swank-scl)
+ #+sbcl (swank-source-path-parser swank-source-file-cache swank-sbcl swank-gray)
+ #+(or openmcl clozurecl) (metering
+ #.(if (and (find-package "CCL")
+ (fboundp (intern "COMPUTE-APPLICABLE-METHODS-USING-CLASSES" "CCL")))
+ 'swank-ccl
+ 'swank-openmcl)
+ swank-gray)
+ #+lispworks (swank-lispworks swank-gray)
+ #+allegro (swank-allegro swank-gray)
+ #+clisp (xref metering swank-clisp swank-gray)
+ #+armedbear (swank-abcl)
+ #+cormanlisp (swank-corman swank-gray)
+ #+ecl (swank-source-path-parser swank-source-file-cache swank-ecl swank-gray))
+
+#-(or cmu scl sbcl openmcl clozurecl lispworks allegro clisp armedbear cormanlisp ecl)
+(error "Your CL implementation is not supported !")
+
+(defpackage #:swank-loader
+ (:use #:common-lisp)
+ (:export #:*source-directory*))
+
+(in-package #:swank-loader)
+
+(defparameter *source-directory*
+ (asdf:component-pathname (asdf:find-system :swank)))
+
+;; (funcall (intern (string :warn-unimplemented-interfaces) :swank-backend))
+
+;; swank.asd ends here
diff --git a/app-emacs/slime/files/2.0_p20130214/gentoo-module-load.patch b/app-emacs/slime/files/2.0_p20130214/gentoo-module-load.patch
new file mode 100644
index 000000000000..c25a248d04ab
--- /dev/null
+++ b/app-emacs/slime/files/2.0_p20130214/gentoo-module-load.patch
@@ -0,0 +1,84 @@
+--- slime-9999-orig/contrib/swank-arglists.lisp 2012-08-14 06:50:34.000000000 +1000
++++ slime-9999/contrib/swank-arglists.lisp 2013-02-14 21:33:26.879124163 +1100
+@@ -9,8 +9,7 @@
+
+ (in-package :swank)
+
+-(eval-when (:compile-toplevel :load-toplevel :execute)
+- (swank-require :swank-c-p-c))
++(swank-require :swank-c-p-c)
+
+ ;;;; Utilities
+
+--- slime-9999-orig/contrib/swank-fuzzy.lisp 2013-02-02 20:48:51.000000000 +1100
++++ slime-9999/contrib/swank-fuzzy.lisp 2013-02-14 21:35:32.059873714 +1100
+@@ -10,9 +10,8 @@
+
+ (in-package :swank)
+
+-(eval-when (:compile-toplevel :load-toplevel :execute)
+- (swank-require :swank-util)
+- (swank-require :swank-c-p-c))
++(swank-require :swank-util)
++(swank-require :swank-c-p-c)
+
+ ;;; For nomenclature of the fuzzy completion section, please read
+ ;;; through the following docstring.
+--- slime-9999-orig/contrib/swank-sbcl-exts.lisp 2009-09-25 16:43:33.000000000 +1000
++++ slime-9999/contrib/swank-sbcl-exts.lisp 2013-02-14 21:33:26.880124185 +1100
+@@ -7,8 +7,7 @@
+
+ (in-package :swank)
+
+-(eval-when (:compile-toplevel :load-toplevel :execute)
+- (swank-require :swank-arglists))
++(swank-require :swank-arglists)
+
+ ;; We need to do this so users can place `slime-sbcl-exts' into their
+ ;; ~/.emacs, and still use any implementation they want.
+--- slime-9999-orig/swank.lisp 2013-01-11 20:00:30.000000000 +1100
++++ slime-9999/swank.lisp 2013-02-14 22:15:39.624982175 +1100
+@@ -2535,14 +2535,17 @@
+ "Load the module MODULE."
+ (dolist (module (ensure-list modules))
+ (unless (member (string module) *modules* :test #'string=)
+- (require module (if filename
+- (filename-to-pathname filename)
+- (module-filename module)))
++ (let ((*load-print* nil)
++ (*load-verbose* nil)
++ #+cmu (ext:*gc-verbose* nil))
++ (require module (if filename
++ (filename-to-pathname filename)
++ (module-filename module))))
+ (assert (member (string module) *modules* :test #'string=)
+ () "Required module ~s was not provided" module)))
+ *modules*)
+
+-(defvar *find-module* 'find-module
++(defvar *find-module* 'find-module-gentoo
+ "Pluggable function to locate modules.
+ The function receives a module name as argument and should return
+ the filename of the module (or nil if the file doesn't exist).")
+@@ -2572,6 +2575,21 @@
+ (some (lambda (dir) (some #'probe-file (module-canditates name dir)))
+ *load-path*)))
+
++(defun swank-fasl-pathname ()
++ (make-pathname :name nil :type nil
++ :defaults (car (asdf:output-files
++ (make-instance 'asdf:compile-op)
++ (car (asdf:module-components
++ (asdf:find-system :swank)))))))
++
++(defun append-dir (pathname dir)
++ (make-pathname :directory (append (pathname-directory pathname) dir)))
++
++(defun find-module-gentoo (module)
++ (or (let ((*load-path* (list (append-dir (swank-fasl-pathname) '("contrib"))
++ (append-dir swank-loader:*source-directory* '("contrib")))))
++ (find-module module))
++ (find-module module)))
+
+ ;;;; Macroexpansion
+
diff --git a/app-emacs/slime/files/2.11/dont-load-sbcl-pprint.patch b/app-emacs/slime/files/2.11/dont-load-sbcl-pprint.patch
new file mode 100644
index 000000000000..c7dafb6cb91a
--- /dev/null
+++ b/app-emacs/slime/files/2.11/dont-load-sbcl-pprint.patch
@@ -0,0 +1,13 @@
+diff --git a/contrib/swank-presentation-streams.lisp b/contrib/swank-presentation-streams.lisp
+index 0c24bda..bd5a990 100644
+--- a/contrib/swank-presentation-streams.lisp
++++ b/contrib/swank-presentation-streams.lisp
+@@ -65,7 +65,7 @@ be sensitive and remember what object it is in the repl if predicate is true"
+ (funcall ,continue)))))
+
+ ;;; Get pretty printer patches for SBCL at load (not compile) time.
+-#+sbcl
++#+#:disable-dangerous-patching ; #+sbcl
+ (eval-when (:load-toplevel)
+ (handler-bind ((simple-error
+ (lambda (c)
diff --git a/app-emacs/slime/files/2.11/gentoo-changelog-date.patch b/app-emacs/slime/files/2.11/gentoo-changelog-date.patch
new file mode 100644
index 000000000000..4d7669a34d29
--- /dev/null
+++ b/app-emacs/slime/files/2.11/gentoo-changelog-date.patch
@@ -0,0 +1,20 @@
+--- slime-2.11-orig/slime.el 2014-12-01 21:05:54.000000000 +1100
++++ slime-2.11/slime.el 2014-12-19 11:57:45.455393436 +1100
+@@ -134,16 +134,7 @@
+ "Return the datestring of the latest entry in the ChangeLog file.
+ Return nil if the ChangeLog file cannot be found."
+ (interactive "p")
+- (let ((changelog (expand-file-name "ChangeLog" slime-path))
+- (date nil))
+- (when (file-exists-p changelog)
+- (with-temp-buffer
+- (insert-file-contents-literally changelog nil 0 100)
+- (goto-char (point-min))
+- (setq date (symbol-name (read (current-buffer))))))
+- (when interactivep
+- (message "Slime ChangeLog dates %s." date))
+- date)))
++ "@SLIME-CHANGELOG-DATE@"))
+
+ (defvar slime-protocol-version nil)
+ (setq slime-protocol-version
diff --git a/app-emacs/slime/files/2.15/gentoo-changelog-date.patch b/app-emacs/slime/files/2.15/gentoo-changelog-date.patch
new file mode 100644
index 000000000000..c7e815f00fe6
--- /dev/null
+++ b/app-emacs/slime/files/2.15/gentoo-changelog-date.patch
@@ -0,0 +1,20 @@
+--- slime-2.15-orig/slime.el 2015-08-31 07:46:47.000000000 +1000
++++ slime-2.15/slime.el 2015-09-17 17:05:53.616659817 +1000
+@@ -138,16 +138,7 @@
+ "Return the datestring of the latest entry in the ChangeLog file.
+ Return nil if the ChangeLog file cannot be found."
+ (interactive "p")
+- (let ((changelog (slime--changelog-file-name))
+- (date nil))
+- (when (file-exists-p changelog)
+- (with-temp-buffer
+- (insert-file-contents-literally changelog nil 0 100)
+- (goto-char (point-min))
+- (setq date (symbol-name (read (current-buffer))))))
+- (when interactivep
+- (message "Slime ChangeLog dates %s." date))
+- date)))
++ "@SLIME-CHANGELOG-DATE@"))
+
+ (defvar slime-protocol-version nil)
+ (setq slime-protocol-version
diff --git a/app-emacs/slime/files/70slime-gentoo.el b/app-emacs/slime/files/70slime-gentoo.el
new file mode 100644
index 000000000000..6dfd505133e2
--- /dev/null
+++ b/app-emacs/slime/files/70slime-gentoo.el
@@ -0,0 +1,13 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'load-path "@SITELISP@/contrib")
+(autoload 'slime-highlight-edits-mode "slime-highlight-edits" nil t)
+
+(require 'slime-autoloads)
+(slime-setup '(slime-fancy slime-asdf slime-banner))
+
+;; this allows us not to require dev-lisp/hyperspec
+;; (which is non-free) as a hard dependency
+(setq common-lisp-hyperspec-root
+ (if (file-exists-p "/usr/share/doc/hyperspec/HyperSpec")
+ "file:///usr/share/doc/hyperspec/HyperSpec/"
+ "http://www.lispworks.com/reference/HyperSpec/"))
diff --git a/app-emacs/slime/files/slime-2.20-fix-doc-build.patch b/app-emacs/slime/files/slime-2.20-fix-doc-build.patch
new file mode 100644
index 000000000000..c95608c7705a
--- /dev/null
+++ b/app-emacs/slime/files/slime-2.20-fix-doc-build.patch
@@ -0,0 +1,94 @@
+diff -Nuar a/doc/slime.texi b/doc/slime.texi
+--- a/doc/slime.texi 2017-08-28 13:51:57.000000000 +0200
++++ b/doc/slime.texi 2018-04-08 17:21:16.004697168 +0200
+@@ -1219,7 +1219,8 @@
+ Describe the slot at point.
+
+ @kbditem{e, slime-inspector-eval}
+-Evaluate an expression in the context of the inspected object.
++Evaluate an expression in the context of the inspected object. The
++variable @code{*} will be bound to the inspected object.
+
+ @kbditem{v, slime-inspector-toggle-verbose}
+ Toggle between verbose and terse mode. Default is determined by
+@@ -1250,8 +1251,7 @@
+ Store the value under point in the variable `*'. This can
+ then be used to access the object in the REPL.
+
+-@kbditempair{TAB, S-TAB, slime-inspector-next-inspectable-object,
+-slime-inspector-previous-inspectable-object}
++@kbditempair{TAB, S-TAB, slime-inspector-next-inspectable-object, slime-inspector-previous-inspectable-object}
+
+ Jump to the next and previous inspectable object respectively.
+
+@@ -2016,7 +2016,7 @@
+ On the emacs side you will use something like
+ @example
+ (setq slime-net-coding-system 'utf-8-unix)
+-(slime-connect "127.0.0.1" 4005))
++(slime-connect "localhost" 4005))
+ @end example
+ to connect to this lisp image from the same machine.
+
+@@ -2028,7 +2028,7 @@
+ remote machine.
+
+ @example
+-ssh -L4005:127.0.0.1:4005 username@@remote.example.com
++ssh -L4005:localhost:4005 username@@remote.example.com
+ @end example
+
+ That ssh invocation creates an ssh tunnel between the port 4005 on our
+@@ -2044,9 +2044,9 @@
+ @end example
+
+ The @kbd{RET RET} sequence just means that we want to use the default
+-host (@code{127.0.0.1}) and the default port (@code{4005}). Even
++host (@code{localhost}) and the default port (@code{4005}). Even
+ though we're connecting to a remote machine the ssh tunnel fools Emacs
+-into thinking it's actually @code{127.0.0.1}.
++into thinking it's actually @code{localhost}.
+
+ @c -----------------------
+ @node Setting up pathname translations
+@@ -2323,8 +2323,7 @@
+
+ @table @kbd
+
+-@kbditempair{C-<up>, C-<down>,
+- slime-repl-forward-input, slime-repl-backward-input}
++@kbditempair{C-<up>, C-<down>, slime-repl-forward-input, slime-repl-backward-input}
+ Go to the next/previous history item.
+
+ @kbditempair{M-n, M-p, slime-repl-next-input, slime-repl-previous-input}
+@@ -2333,16 +2332,14 @@
+ a row, the second invocation uses the same search pattern (even if the
+ current input has changed).
+
+-@kbditempair{M-s, M-r,
+-slime-repl-next-matching-input, slime-repl-previous-matching-input}
++@kbditempair{M-s, M-r, slime-repl-next-matching-input, slime-repl-previous-matching-input}
+ Search forward/reverse through command history with regex
+
+ @c @code{slime-repl-@{next,previous@}-input}@*
+ @c @code{slime-repl-@{next,previous@}-matching-input}@*
+ @c @code{comint}-style input history commands.
+
+-@kbditempair{C-c C-n, C-c C-p,
+-slime-repl-next-prompt, slime-repl-previous-prompt}
++@kbditempair{C-c C-n, C-c C-p, slime-repl-next-prompt, slime-repl-previous-prompt}
+ Move between the current and previous prompts in the @REPL{} buffer.
+ Pressing RET on a line with old input copies that line to the newest
+ prompt.
+@@ -2655,6 +2652,11 @@
+ If @code{slime-autodoc-use-multiline-p} is set to non-nil,
+ allow long autodoc messages to resize echo area display.
+
++@vindex slime-autodoc-mode-string
++@code{slime-autodoc-mode-string} is a string that will be displayed in
++the mode line when autodoc-mode is enabled, or nil, if you prefer no
++indication. You can customize this variable.
++
+ @node ASDF
+ @section ASDF
+
diff --git a/app-emacs/slime/files/swank-loader.lisp b/app-emacs/slime/files/swank-loader.lisp
new file mode 100644
index 000000000000..4d9b157312e6
--- /dev/null
+++ b/app-emacs/slime/files/swank-loader.lisp
@@ -0,0 +1,4 @@
+
+;; This file is NOT part of SLIME
+
+(asdf:oos 'asdf:load-op :swank)
diff --git a/app-emacs/slime/metadata.xml b/app-emacs/slime/metadata.xml
new file mode 100644
index 000000000000..fdaa0a02bc79
--- /dev/null
+++ b/app-emacs/slime/metadata.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>common-lisp@gentoo.org</email>
+ <name>Gentoo Common Lisp Project</name>
+</maintainer>
+<longdescription>
+ SLIME: The Superior Lisp Interaction Mode for Emacs. SLIME is a
+ fresh, new Emacs mode for Common Lisp development inspired by existing
+ systems such Emacs Lisp and ILISP. Feature highlights include:
+
+ * slime-mode: An Emacs minor-mode to enhance lisp-mode with:
+ o Code evaluation, compilation, and macroexpansion.
+ o Online documentation (describe, apropos, hyperspec).
+ o Definition finding (aka Meta-Point aka M-.).
+ o Symbol and package name completion.
+ o Automatic macro indentation based on &amp;body.
+ o Cross-reference interface (WHO-CALLS, etc).
+ o ... and more.
+
+ * SLDB: Common Lisp debugger with an Emacs-based user interface.
+
+ * REPL: The Read-Eval-Print Loop ("top-level") is written in Emacs
+ Lisp for tighter integration with Emacs. The REPL also has builtin
+ "shortcut" commands similar those of the McCLIM Listener.
+
+ * Compilation notes: SLIME is able to take compiler messages and
+ annotate them directly into source buffers.
+
+ * Inspector: Interactive object-inspector in an Emacs buffer.
+</longdescription>
+<stabilize-allarches/>
+<use>
+ <flag name="xref">Install xref.lisp cross-referencing tool</flag>
+</use>
+<upstream>
+ <remote-id type="github">slime/slime</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/slime/slime-2.15.ebuild b/app-emacs/slime/slime-2.15.ebuild
new file mode 100644
index 000000000000..26d86bd44bde
--- /dev/null
+++ b/app-emacs/slime/slime-2.15.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+[[ ${PV} = *9999* ]] && GIT_ECLASS="git-r3" || GIT_ECLASS=""
+
+inherit common-lisp-3 ${GIT_ECLASS} elisp eutils
+
+DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
+HOMEPAGE="http://common-lisp.net/project/slime/"
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/slime/slime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2 xref? ( xref.lisp )"
+SLOT="0"
+if [[ ${PV} != *9999* ]]; then
+ KEYWORDS="amd64 ppc ~sparc x86"
+fi
+IUSE="doc xref"
+RESTRICT=test # tests fail to contact sbcl
+
+RDEPEND="virtual/commonlisp
+ dev-lisp/asdf"
+DEPEND="${RDEPEND}
+ >=sys-apps/texinfo-5.1
+ doc? ( virtual/texi2dvi )"
+
+CLPACKAGE=swank
+CLSYSTEMS=swank
+SITEFILE=70${PN}-gentoo.el
+
+src_unpack() {
+ if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/slime/slime.git"
+ ${GIT_ECLASS}_src_unpack
+ fi
+ elisp_src_unpack
+}
+
+src_prepare() {
+ if [[ "${PV}" == "2.11" ]]; then
+ epatch "${FILESDIR}"/2.11/dont-load-sbcl-pprint.patch
+ fi
+ epatch "${FILESDIR}"/2.0_p20130214/gentoo-module-load.patch
+ epatch "${FILESDIR}"/2.0_p20110617/gentoo-dont-call-init.patch
+ has_version ">=app-editors/emacs-24" && rm -f lib/cl-lib.el
+
+ # extract date of last update from ChangeLog, bug 233270
+ SLIME_CHANGELOG_DATE=$(awk '/^[-0-9]+ / { print $1; exit; }' ChangeLog)
+ [ -n "${SLIME_CHANGELOG_DATE}" ] || die "cannot determine ChangeLog date"
+
+ if [[ "${PV}" == "2.11" ]] || [[ "${PV}" == "2.12" ]]; then
+ # SLIME uses the changelog date to make sure that the emacs side and the CL side
+ # are in sync. We hardcode it instead of letting slime determine it at runtime
+ # because ChangeLog doesn't get installed to $EMACSDIR
+ epatch "${FILESDIR}"/2.11/gentoo-changelog-date.patch
+ else
+ epatch "${FILESDIR}"/2.15/gentoo-changelog-date.patch
+ fi
+
+ # When starting slime in emacs, slime looks for ${S}/swank/backend.lisp as
+ # /usr/share/common-lisp/source/swank/swank-backend.lisp
+ pushd swank || die
+ for i in *.lisp
+ do
+ mv ${i} ../swank-${i}
+ done
+ popd
+
+ sed -i "/(defvar \*swank-wire-protocol-version\*/s:nil:\"${SLIME_CHANGELOG_DATE}\":" swank.lisp \
+ || die "sed swank.lisp failed"
+ sed -i "s:@SLIME-CHANGELOG-DATE@:${SLIME_CHANGELOG_DATE}:" slime.el \
+ || die "sed slime.el failed"
+ sed -i "s/@itemx INIT-FUNCTION/@item INIT-FUNCTION/" doc/slime.texi \
+ || die "sed doc/slime.texi failed"
+
+ # Remove xref.lisp (which is non-free) unless USE flag is set
+ use xref || rm -f xref.lisp
+}
+
+src_compile() {
+ elisp-compile *.el || die
+ BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
+ elisp-compile contrib/*.el lib/*.el || die
+ emake -j1 -C doc slime.info || die "Cannot build info docs"
+
+ if use doc; then
+ VARTEXFONTS="${T}"/fonts \
+ emake -j1 -C doc slime.pdf || die "emake doc failed"
+ fi
+}
+
+src_install() {
+ ## install core
+ elisp-install ${PN} *.{el,elc} "${FILESDIR}"/swank-loader.lisp \
+ || die "Cannot install SLIME core"
+ sed "s:/usr/:${EPREFIX}&:g" "${FILESDIR}"/2.0_p20110617/${SITEFILE} \
+ >"${T}"/${SITEFILE} || die "sed failed"
+ elisp-site-file-install "${T}"/${SITEFILE} || die
+ cp "${FILESDIR}"/2.0_p20110617/swank.asd "${S}"
+ # remove upstream swank-loader, since it won't be used
+ rm "${S}"/swank-loader.lisp
+ common-lisp-install-sources *.lisp
+ common-lisp-install-asdf swank.asd
+
+ ## install contribs
+ elisp-install ${PN}/contrib/ contrib/*.{el,elc,scm,goo} \
+ || die "Cannot install contribs"
+ common-lisp-install-sources contrib/*.lisp
+
+ ## install lib
+ elisp-install ${PN}/lib/ lib/*.{el,elc} \
+ || die "Cannot install libs"
+
+ ## install docs
+ dodoc README.md ChangeLog CONTRIBUTING.md NEWS PROBLEMS
+ newdoc contrib/README.md README-contrib.md
+ newdoc contrib/ChangeLog ChangeLog.contrib
+ doinfo doc/slime.info
+ use doc && dodoc doc/*.pdf
+}
diff --git a/app-emacs/slime/slime-2.20-r1.ebuild b/app-emacs/slime/slime-2.20-r1.ebuild
new file mode 100644
index 000000000000..8c79ae0d45c3
--- /dev/null
+++ b/app-emacs/slime/slime-2.20-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
+HOMEPAGE="http://common-lisp.net/project/slime/"
+SRC_URI="https://github.com/slime/slime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 xref? ( xref.lisp )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc xref"
+RESTRICT=test # tests fail to contact sbcl
+
+RDEPEND="virtual/commonlisp
+ dev-lisp/asdf"
+DEPEND="${RDEPEND}
+ >=sys-apps/texinfo-5.1
+ doc? ( virtual/texi2dvi )"
+
+CLPACKAGE=swank
+CLSYSTEMS=swank
+SITEFILE=70${PN}-gentoo.el
+
+PATCHES=(
+ # Should be fixed in >=app-emacs/slime-2.20
+ "${FILESDIR}/${PN}-2.20-fix-doc-build.patch"
+)
+
+src_prepare() {
+ default
+ # Remove xref.lisp (which is non-free) unless USE flag is set
+ use xref || rm -f xref.lisp
+}
+
+src_compile() {
+ elisp-compile *.el || die
+ BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
+ elisp-compile contrib/*.el lib/*.el || die
+
+ emake -C doc slime.info || die
+ if use doc ; then
+ VARTEXFONTS="${T}"/fonts \
+ emake -C doc all
+ fi
+}
+
+src_install() {
+ # Install core
+ elisp-install ${PN} *.{el,elc,lisp} || die "Cannot install SLIME core"
+
+ # Install contribs
+ elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo} \
+ || die "Cannot install contribs"
+
+ # Install lib
+ elisp-install ${PN}/lib/ lib/*.{el,elc} || die "Cannot install libs"
+
+ # Install swank
+ elisp-install ${PN}/swank/ swank/*.lisp || die "Cannot install swank"
+
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die "Cannon install site file"
+ # Install docs
+ dodoc README.md CONTRIBUTING.md NEWS PROBLEMS
+ newdoc contrib/README.md README-contrib.md
+ doinfo doc/slime.info
+ use doc && dodoc doc/*.pdf
+
+ # Bug #656760
+ touch "${ED}${SITELISP}/${PN}/lib/.nosearch" || die
+}
diff --git a/app-emacs/slime/slime-2.20.ebuild b/app-emacs/slime/slime-2.20.ebuild
new file mode 100644
index 000000000000..d03c14d9dbf8
--- /dev/null
+++ b/app-emacs/slime/slime-2.20.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
+HOMEPAGE="http://common-lisp.net/project/slime/"
+SRC_URI="https://github.com/slime/slime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 xref? ( xref.lisp )"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
+IUSE="doc xref"
+RESTRICT=test # tests fail to contact sbcl
+
+RDEPEND="virtual/commonlisp
+ dev-lisp/asdf"
+DEPEND="${RDEPEND}
+ >=sys-apps/texinfo-5.1
+ doc? ( virtual/texi2dvi )"
+
+CLPACKAGE=swank
+CLSYSTEMS=swank
+SITEFILE=70${PN}-gentoo.el
+
+PATCHES=(
+ # Should be fixed in >=app-emacs/slime-2.20
+ "${FILESDIR}/${PN}-2.20-fix-doc-build.patch"
+)
+
+src_prepare() {
+ default
+ # Remove xref.lisp (which is non-free) unless USE flag is set
+ use xref || rm -f xref.lisp
+}
+
+src_compile() {
+ elisp-compile *.el || die
+ BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
+ elisp-compile contrib/*.el lib/*.el || die
+
+ emake -C doc slime.info || die
+ if use doc ; then
+ VARTEXFONTS="${T}"/fonts \
+ emake -C doc all
+ fi
+}
+
+src_install() {
+ ## install core
+ elisp-install ${PN} *.{el,elc,lisp} || die "Cannot install SLIME core"
+
+ ## install contribs
+ elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo} \
+ || die "Cannot install contribs"
+
+ ## install lib
+ elisp-install ${PN}/lib/ lib/*.{el,elc} || die "Cannot install libs"
+
+ ## install swank
+ elisp-install ${PN}/swank/ swank/*.lisp || die "Cannot install swank"
+
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+ ## install docs
+ dodoc README.md CONTRIBUTING.md NEWS PROBLEMS
+ newdoc contrib/README.md README-contrib.md
+ doinfo doc/slime.info
+ use doc && dodoc doc/*.pdf
+}
diff --git a/app-emacs/slime/slime-2.21.ebuild b/app-emacs/slime/slime-2.21.ebuild
new file mode 100644
index 000000000000..aa82b5505f38
--- /dev/null
+++ b/app-emacs/slime/slime-2.21.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="SLIME, the Superior Lisp Interaction Mode (Extended)"
+HOMEPAGE="http://common-lisp.net/project/slime/"
+SRC_URI="https://github.com/slime/slime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 xref? ( xref.lisp )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc xref"
+RESTRICT=test # tests fail to contact sbcl
+
+RDEPEND="virtual/commonlisp
+ dev-lisp/asdf"
+DEPEND="${RDEPEND}
+ >=sys-apps/texinfo-5.1
+ doc? ( virtual/texi2dvi )"
+
+CLPACKAGE=swank
+CLSYSTEMS=swank
+SITEFILE=70${PN}-gentoo.el
+
+src_prepare() {
+ default
+ # Remove xref.lisp (which is non-free) unless USE flag is set
+ use xref || rm -f xref.lisp
+}
+
+src_compile() {
+ elisp-compile *.el || die
+ BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
+ elisp-compile contrib/*.el lib/*.el || die
+
+ emake -C doc slime.info || die
+ if use doc ; then
+ VARTEXFONTS="${T}"/fonts \
+ emake -C doc all
+ fi
+}
+
+src_install() {
+ # Install core
+ elisp-install ${PN} *.{el,elc,lisp} || die "Cannot install SLIME core"
+
+ # Install contribs
+ elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo} \
+ || die "Cannot install contribs"
+
+ # Install lib
+ elisp-install ${PN}/lib/ lib/*.{el,elc} || die "Cannot install libs"
+
+ # Install swank
+ elisp-install ${PN}/swank/ swank/*.lisp || die "Cannot install swank"
+
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die "Cannon install site file"
+ # Install docs
+ dodoc README.md CONTRIBUTING.md NEWS PROBLEMS
+ newdoc contrib/README.md README-contrib.md
+ doinfo doc/slime.info
+ use doc && dodoc doc/*.pdf
+
+ # Bug #656760
+ touch "${ED}${SITELISP}/${PN}/lib/.nosearch" || die
+}
diff --git a/app-emacs/sml-mode-6.4 b/app-emacs/sml-mode-6.4
deleted file mode 100644
index f91d92bd5917..000000000000
--- a/app-emacs/sml-mode-6.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-24
-DESCRIPTION=Emacs major mode for editing Standard ML
-EAPI=5
-HOMEPAGE=http://www.iro.umontreal.ca/~monnier/elisp/
-KEYWORDS=alpha amd64 ppc x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-24
-SLOT=0
-SRC_URI=mirror://gentoo/sml-mode-6.4.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=efa5606badc441fd5eb4b3efe4240a4e
diff --git a/app-emacs/sml-mode/Manifest b/app-emacs/sml-mode/Manifest
new file mode 100644
index 000000000000..c52b6136accd
--- /dev/null
+++ b/app-emacs/sml-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50sml-mode-gentoo-6.1.el 72 BLAKE2B e4b7e4fa2f440410e323da54183257aff3bf555ebaa5e1d3d579375b9bbc5e77bfa1af68e4d305013ca07d9a16df2618d3b5eca6035a42810f87f3abf8bfbab0 SHA512 f8b15038063e9419a5dbcb9b98696df8d431d86806e06d24645671d3c3b5b79c3c31e32330efbbbc0b72a38c841273a14f998bb62ca0cacaf3483507ec8d7444
+DIST sml-mode-6.4.el.xz 20512 BLAKE2B ec82b44e7e1ff9d4c89ffdec6d29afddb2bb5a62474dfef417409496fd374373aca53f3a850990972e888ec2dc006606a06c63e327316e28552273d7995cd38e SHA512 238c69cf34bdd9b825fdc00e65741a458e64bf4bf38ed96ba0518154dd92f25877d56d09f4c13271577ea8641ca828023db950db07a42fe1a02659527b65cb5b
+EBUILD sml-mode-6.4.ebuild 500 BLAKE2B b55d6c334be8bd80667740d582d2e3f18dab432fa5a559f900f2b2528f4c3e256972842d45bf92e1a73fbb9178aa0388e9d6bdda87f107345dfa9a2dd07fb671 SHA512 a1d7a446d46b78b50efd2d907efab0aa2363fc2742602e7c183cb8770d994c931597b6ae15c194da1b9d0909de26b1561c12a7e289e600f969772cdeca8f8590
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/sml-mode/files/50sml-mode-gentoo-6.1.el b/app-emacs/sml-mode/files/50sml-mode-gentoo-6.1.el
new file mode 100644
index 000000000000..feb0eb3a9551
--- /dev/null
+++ b/app-emacs/sml-mode/files/50sml-mode-gentoo-6.1.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "sml-mode-autoloads" nil t)
diff --git a/app-emacs/sml-mode/metadata.xml b/app-emacs/sml-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/sml-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/sml-mode/sml-mode-6.4.ebuild b/app-emacs/sml-mode/sml-mode-6.4.ebuild
new file mode 100644
index 000000000000..7eb5bbb42718
--- /dev/null
+++ b/app-emacs/sml-mode/sml-mode-6.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing Standard ML"
+HOMEPAGE="http://www.iro.umontreal.ca/~monnier/elisp/"
+# taken from https://elpa.gnu.org/packages/${P}.el
+SRC_URI="mirror://gentoo/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc x86"
+
+SITEFILE="50${PN}-gentoo-6.1.el"
+
+src_compile() {
+ elisp-compile *.el
+ elisp-make-autoload-file
+}
diff --git a/app-emacs/sokoban-1.4 b/app-emacs/sokoban-1.4
deleted file mode 100644
index 3d4ae005620a..000000000000
--- a/app-emacs/sokoban-1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Implementation of Sokoban for Emacs
-EAPI=5
-HOMEPAGE=https://elpa.gnu.org/packages/sokoban.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://elpa.gnu.org/packages/sokoban-1.4.tar
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=8326b11b7282fc2081463a76e1ea434e
diff --git a/app-emacs/sokoban/Manifest b/app-emacs/sokoban/Manifest
new file mode 100644
index 000000000000..a43b73556c3a
--- /dev/null
+++ b/app-emacs/sokoban/Manifest
@@ -0,0 +1,4 @@
+AUX 50sokoban-gentoo.el 127 BLAKE2B d0acfad9dcbc8f0a30c37ce1ac9dfac23c804e3830c1b6fd91188421dc785a5499d3b50c12df1e64145e8d45bc2fe7c8ce92d3e7a73c04de91ec6da6e0c44c0f SHA512 361a572d75a32639e37db650184a75dba80f8f63399d919bcf40252b04631e217e78663f03aa9e506f20bb2502816201d49cc6630be3c67177a6ff9895c7a24c
+DIST sokoban-1.4.tar 61440 BLAKE2B b0348084517e4fddfe5adffc6fac3020bc7147983733354fe18bbe90bdd49e620dfb392385c0dbb7ffed47bfd05d6b9b28cdf1bd81cc182fde83b243d33b6415 SHA512 8c04f509013e1d8f6e8cc1e182ec253fc84870e5733623038ea03f2447952dcbc77236c64b158ea4e4613dafce192f2c4b50aac3e1e219a049a6a951a44a7ac1
+EBUILD sokoban-1.4.ebuild 497 BLAKE2B 60456af8f4c0b95589e0630fe43fcbf71ba82c385779b17e7ce00f32041ccec6d693c97da5dcc4f27f1c442520f10918442676b0cf4c7b4c1688ace0c9567514 SHA512 0a91ad19e78815c6ec523b5aa40379f3cdcfa2ee01ebeb1cebb2a825a34d57ff58c395446ad5cb86bcb923a4e4cea44f0af1126f29c87ec4260e4c81ed84f189
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/sokoban/files/50sokoban-gentoo.el b/app-emacs/sokoban/files/50sokoban-gentoo.el
new file mode 100644
index 000000000000..418d409b1335
--- /dev/null
+++ b/app-emacs/sokoban/files/50sokoban-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'sokoban "sokoban" nil t)
+(setq sokoban-level-file "@SITEETC@/sokoban.levels")
diff --git a/app-emacs/sokoban/metadata.xml b/app-emacs/sokoban/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/sokoban/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/sokoban/sokoban-1.4.ebuild b/app-emacs/sokoban/sokoban-1.4.ebuild
new file mode 100644
index 000000000000..55c6a4fd9ec4
--- /dev/null
+++ b/app-emacs/sokoban/sokoban-1.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Implementation of Sokoban for Emacs"
+HOMEPAGE="https://elpa.gnu.org/packages/sokoban.html"
+SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+ELISP_REMOVE="sokoban-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog"
+
+src_install() {
+ elisp_src_install
+ insinto "${SITEETC}/${PN}"
+ doins sokoban.levels
+}
diff --git a/app-emacs/ssh-20120709 b/app-emacs/ssh-20120709
deleted file mode 100644
index 70685b253ea6..000000000000
--- a/app-emacs/ssh-20120709
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Support for SSH sessions in Emacs shell buffers
-EAPI=5
-HOMEPAGE=http://www.splode.com/~friedman/software/emacs-lisp/index.html#ssh
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ssh-20120709.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=6a02d9ef2357593fecc321e4831db3cb
diff --git a/app-emacs/ssh/Manifest b/app-emacs/ssh/Manifest
new file mode 100644
index 000000000000..3423d5741b8f
--- /dev/null
+++ b/app-emacs/ssh/Manifest
@@ -0,0 +1,4 @@
+AUX 50ssh-gentoo.el 174 BLAKE2B d2f0180fa8e10c6788fb59757238e8f82fcda1ddbfd9ede2b99e4ed0a0258436d7d7d4aaa5ebbc9acdbecfe352d31ebb8cb5c53e94c0411689784711a789c7b6 SHA512 730743d6169ead8a100fc9853eef9f1b8ff910b4f32e2deace9434cb22712c4a703b1b946360c120b7c6b290473d767cfc1811fbf79fc2b7db63c81f531c32f9
+DIST ssh-20120709.el.xz 4876 BLAKE2B f4b5d0c1c7f4bc7818b70b9f4c177169fb3e0bc759eba28d64c2c6e614516822f1803a85d38f02c60cda35ba4b33e35013b0a93f2d44e9a776abcf64e1f19f30 SHA512 69048f160bdd1b8ca29f0d49734cff7f9c4360ca9dd2abdacfcbca61bb964e84c962bf6388f424c0eb0161f1e8c8c9787dafebc084826b27d94300fba475ab9c
+EBUILD ssh-20120709.ebuild 422 BLAKE2B c4dfc677f0b66192dbbed9d8a6458641d9ce1fc37baa2a98e4b3f6236f74397d72dbd2c5ea0084bc343930dfc47e1fd2bb2cc998c34676eef4cbb2334a1e0f1c SHA512 958fce78272dc89e0615435425fdfaff146e591c85a75e97dd87d9408006527aa9389491962b9465a27ae37f46dc3cef24654b5d62112c08bffce4344d28c5ce
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/ssh/files/50ssh-gentoo.el b/app-emacs/ssh/files/50ssh-gentoo.el
new file mode 100644
index 000000000000..387ffa532256
--- /dev/null
+++ b/app-emacs/ssh/files/50ssh-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'same-window-regexps "^\\*ssh-.*\\*\\(\\|<[0-9]+>\\)")
+(autoload 'ssh "ssh" "Open a network login connection via `ssh'" t)
diff --git a/app-emacs/ssh/metadata.xml b/app-emacs/ssh/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/ssh/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/ssh/ssh-20120709.ebuild b/app-emacs/ssh/ssh-20120709.ebuild
new file mode 100644
index 000000000000..0b25cdef034f
--- /dev/null
+++ b/app-emacs/ssh/ssh-20120709.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Support for SSH sessions in Emacs shell buffers"
+HOMEPAGE="http://www.splode.com/~friedman/software/emacs-lisp/index.html#ssh"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/stripes-0.2-r1 b/app-emacs/stripes-0.2-r1
deleted file mode 100644
index 31afeb2d90cc..000000000000
--- a/app-emacs/stripes-0.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Emacs mode that alternates the background color of lines
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/StripesMode
-KEYWORDS=alpha amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/stripes-0.2.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=c0c044a6e3b47c66743688d0c4223d0c
diff --git a/app-emacs/stripes/Manifest b/app-emacs/stripes/Manifest
new file mode 100644
index 000000000000..09f03fed00c9
--- /dev/null
+++ b/app-emacs/stripes/Manifest
@@ -0,0 +1,4 @@
+AUX 50stripes-gentoo.el 186 BLAKE2B 0b68c4b1fd826097f21f7c14546d7ebe3331c3b13a73e04fddcc8d1c5eff010a4f5781e2f9717d58e3eda88eabdfaf6b8c478bbf9bf64e243fd97070135447fd SHA512 878ef4a745a46b9e5d053b521ad6e7a5340223e929a2a75dadb4e5f7d9917f9e044454e6a4f02316e145568b0a80daf4925bee26523b257606e18a4fedf6e7e6
+DIST stripes-0.2.tar.gz 2203 BLAKE2B 4daec93d681bd2cb7187b427c13b27990e03bdb34b6131cda3b8d88bd48cdece57d53dd9f124c0f65e2869045e69ca8c98e39cc03b3a6c75f5b1ca359a12582f SHA512 c0e0d7c16f6d593221573268e8ec30f30374a6c4ad6e34458139de90f5cde12cdb02b81e91f40176ea10a9e411921bdeb324eb0bc6aa5f2874602bf38bdf9521
+EBUILD stripes-0.2-r1.ebuild 382 BLAKE2B b4f841db7250a1c2814d1c256dffa7dd16b458251e2e61739c7cec1db6d969dfd1f2b0cce9dfe5f9bedd8bcf51bb4d8e69f35dd5c8d8a0136a3cfd45aafcee50 SHA512 cfa39ee5034080cd8af1408962145148cc946b68954d033cecb822d4db7553b648bf99fd81e60fb9e44ff93e81c400141239e29a8cf42cc11925ab59d9124a56
+MISC metadata.xml 490 BLAKE2B 3794aeee765d0ab57f1fa5f8e32ed06a370f02595456130d40ce45b51e257205ce2760b85dafe9b8680bce36c13c64828a1dac1de53cdf876bd4d85f7d1abfdd SHA512 0fb37665956d36d8d77c5004601d9ef9a62a2aefb24d0fdf908909ba63470b15d8067d6e865374756d16844f9688321196e2cbccf67d6dcdb51433852aed509f
diff --git a/app-emacs/stripes/files/50stripes-gentoo.el b/app-emacs/stripes/files/50stripes-gentoo.el
new file mode 100644
index 000000000000..deeec9acdb6b
--- /dev/null
+++ b/app-emacs/stripes/files/50stripes-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP")
+(autoload 'stripes-mode "stripes" "Toggle Color alternation mode." t)
+(autoload 'turn-on-stripes-mode "stripes" "Turn on color alternation mode." t)
diff --git a/app-emacs/stripes/metadata.xml b/app-emacs/stripes/metadata.xml
new file mode 100644
index 000000000000..b3915ae3c2ff
--- /dev/null
+++ b/app-emacs/stripes/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 type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ Highlights every even line with an alternative background color.
+ Useful for buffers that display lists of any kind - as a guide for
+ your eyes to follow these lines.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/stripes/stripes-0.2-r1.ebuild b/app-emacs/stripes/stripes-0.2-r1.ebuild
new file mode 100644
index 000000000000..9092c334ea81
--- /dev/null
+++ b/app-emacs/stripes/stripes-0.2-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Emacs mode that alternates the background color of lines"
+HOMEPAGE="https://www.emacswiki.org/emacs/StripesMode"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/sumibi-0.5.2 b/app-emacs/sumibi-0.5.2
deleted file mode 100644
index fdb0fbaaac70..000000000000
--- a/app-emacs/sumibi-0.5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Statistical Japanese input method using the Internet as a large corpus
-EAPI=0
-HOMEPAGE=http://www.sumibi.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/sumibi/17176/sumibi-0.5.2.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=560442c45b71e2970dc537c42e02a3cf
diff --git a/app-emacs/sumibi/Manifest b/app-emacs/sumibi/Manifest
new file mode 100644
index 000000000000..d51ad37e0d78
--- /dev/null
+++ b/app-emacs/sumibi/Manifest
@@ -0,0 +1,4 @@
+AUX 50sumibi-gentoo.el 55 BLAKE2B 85278737f6d56a153f6fbf4960bb75a5e1846ac22564f2935973c8998e44fd0293023e5c07cdb1699d0b70f572d3a2a9e19f9d5e5d47630e6c1caeb020d182c1 SHA512 d0042f963199f820cbf231168362873f1a701f81decc0b26a5b63eda68d9cde3485d3cbe23b77e615102bb2f12bf83c41e30c059873f5245555903fd026d453f
+DIST sumibi-0.5.2.tar.gz 26755 BLAKE2B 329c094ed118e9dc53af1fb77fa31f8db5b97d69ac39fb0eaba99eeeeb8ab4588b1f9e232145a3c377fcf38bbaced605e86dd8c1ccb078969762d475d9cff7b7 SHA512 b630be8b7c73ba5e0babc2c2946ddb05019fa15b0a8aaf5b578c97de32094de174d6ced9c0168b2e802e35e2b30b4a02501a0d8c41b90a8f8bb4a85fe501cff3
+EBUILD sumibi-0.5.2.ebuild 717 BLAKE2B 97f5d613608b7d2af7d139b6197e41fd263cef4db00c6309c64434ad89964f3f1bd5ff2b77447a033522b990abb6011ee81bf1ebc73993b45a734683e60ea405 SHA512 79a7b65b1601cae5a9b86d4103182d38357a5313faa3bf35f75b555916b9c4090dfc7f2b2912accc83f71d304d703aaa65a878d02d3416acbbfa5df2b851dab2
+MISC metadata.xml 452 BLAKE2B bfbc315b53a31a9c428ee6b2e95efc541114a73cf1f7893c1d8948d2b9c8ef5ab200f038f79fcbb43db63df2020a40bc545b5ed16a8f0a1796bb270e44ca4cde SHA512 732025258d9133fd4a4955cd9958fdcc666fd19486fb2d6d0ce19e152cf28e8779e177c2364a0ddb8a30be370fb0c01339b895cf9e7418ccb72e4463d5d6dc3f
diff --git a/app-emacs/sumibi/files/50sumibi-gentoo.el b/app-emacs/sumibi/files/50sumibi-gentoo.el
new file mode 100644
index 000000000000..e0292e2481bf
--- /dev/null
+++ b/app-emacs/sumibi/files/50sumibi-gentoo.el
@@ -0,0 +1,4 @@
+
+;;; sumibi site-lisp configuration
+
+(require 'sumibi)
diff --git a/app-emacs/sumibi/metadata.xml b/app-emacs/sumibi/metadata.xml
new file mode 100644
index 000000000000..f568990d4c45
--- /dev/null
+++ b/app-emacs/sumibi/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge-jp">sumibi</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/sumibi/sumibi-0.5.2.ebuild b/app-emacs/sumibi/sumibi-0.5.2.ebuild
new file mode 100644
index 000000000000..141d4a933cab
--- /dev/null
+++ b/app-emacs/sumibi/sumibi-0.5.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit elisp
+
+DESCRIPTION="Statistical Japanese input method using the Internet as a large corpus"
+HOMEPAGE="http://www.sumibi.org/"
+SRC_URI="mirror://sourceforge.jp/sumibi/17176/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+SITEFILE=50${PN}-gentoo.el
+
+src_compile() {
+ cd client/elisp
+ elisp-compile *.el || die "elisp-compile failed"
+}
+
+src_install() {
+ cd client/elisp
+ elisp-install ${PN} *.{el,elc} || die "elisp-install failed"
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+ || die "elisp-site-file-install failed"
+
+ cd "${S}"
+ dodoc README CREDITS CHANGELOG
+}
diff --git a/app-emacs/tdtd-0.7.1-r1 b/app-emacs/tdtd-0.7.1-r1
deleted file mode 100644
index a84406d3f80f..000000000000
--- a/app-emacs/tdtd-0.7.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=app-arch/unzip >=virtual/emacs-23
-DESCRIPTION=Emacs Major Mode for SGML and XML DTDs
-EAPI=0
-HOMEPAGE=http://www.menteith.com/wiki/tdtd
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.menteith.com/raw-attachment/wiki/tdtd/data/tdtd071.zip
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=f8708119d34b07c40de6d2ac43e255cc
diff --git a/app-emacs/tdtd/Manifest b/app-emacs/tdtd/Manifest
new file mode 100644
index 000000000000..123ab15a6634
--- /dev/null
+++ b/app-emacs/tdtd/Manifest
@@ -0,0 +1,4 @@
+AUX 50tdtd-gentoo.el 742 BLAKE2B 182ef610170ac1de9f8726acb5f9f6673ac8e4a76fc4707ea1b3a713262cc7f3f1e62c75448e64eeaceae83a8a1251b2e461ae2e21ee64320b3960278fa18af9 SHA512 c3a3e7121fa6634c664845584934411a6da2259e1ed839511f0f53d28d87a3f78269d90da16ed91ee8b35d6a5f29245e4d85aaf10b3e20d1ebe6b072a39fb662
+DIST tdtd071.zip 37673 BLAKE2B 0bc5be6e8c9050a06b233b1645fe3bb3ad9bb89ba087309d75afd63af28ce1d4873c88447fcd6e654f50728682d5156e1a795865f11f5e2e54607e630687ed0a SHA512 3de529178718352bc437a3e91d3102990a88314d1dc5ad3d3120c6dfcbb1aef008edc00e46ee051fd5c968c698230393a301dd645484aa748b5b982df84e0556
+EBUILD tdtd-0.7.1-r1.ebuild 506 BLAKE2B b90dad61c9daf9413c3625269ac6c11c4dc6a39b23010e42e434256a088d0257d1caa7376eaa3ad08ebec8593a8c716f7c335be21ab2067fa1f3b0089e37ee8c SHA512 a78911cfc8dd31c7bff52b6decc97a880be0e24e5330a34ff54d503c2421103814d47bc5913fbfa5a968edb6e8f123fe1e9ded016632e97ddb064f4ba40754d3
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/tdtd/files/50tdtd-gentoo.el b/app-emacs/tdtd/files/50tdtd-gentoo.el
new file mode 100644
index 000000000000..3867c8faa137
--- /dev/null
+++ b/app-emacs/tdtd/files/50tdtd-gentoo.el
@@ -0,0 +1,28 @@
+
+;;; tdtd site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'dtd-mode "tdtd" "Major mode to edit DTD files." t)
+(autoload 'dtd-etags "tdtd"
+ "Execute etags on FILESPEC and match on DTD-specific regular expressions."
+ t)
+(autoload 'dtd-grep "tdtd" "Grep for PATTERN in files matching FILESPEC." t)
+
+;; Turn on font lock when in DTD mode
+(add-hook 'dtd-mode-hooks
+ 'turn-on-font-lock)
+
+(setq auto-mode-alist
+ (append
+ (list
+ '("\\.dcl$" . dtd-mode)
+ '("\\.dec$" . dtd-mode)
+ '("\\.dtd$" . dtd-mode)
+ '("\\.ele$" . dtd-mode)
+ '("\\.ent$" . dtd-mode)
+ '("\\.mod$" . dtd-mode))
+ auto-mode-alist))
+
+;; To use resize-minibuffer-mode, uncomment this and include in your .emacs:
+;;(resize-minibuffer-mode)
diff --git a/app-emacs/tdtd/metadata.xml b/app-emacs/tdtd/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/tdtd/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/tdtd/tdtd-0.7.1-r1.ebuild b/app-emacs/tdtd/tdtd-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..0d8bb44d238f
--- /dev/null
+++ b/app-emacs/tdtd/tdtd-0.7.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit elisp
+
+DESCRIPTION="Emacs Major Mode for SGML and XML DTDs"
+HOMEPAGE="http://www.menteith.com/wiki/tdtd"
+SRC_URI="http://www.menteith.com/raw-attachment/wiki/tdtd/data/${PN}${PV//./}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+SITEFILE=50${PN}-gentoo.el
+DOCS="TODO changelog.txt readme.txt tutorial.txt"
diff --git a/app-emacs/teco-7-r1 b/app-emacs/teco-7-r1
deleted file mode 100644
index bd8bfa26fb83..000000000000
--- a/app-emacs/teco-7-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=TECO interpreter for GNU Emacs
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/TECO
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/teco-7.el.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5d215180cb6c6da72dd796d079310908
diff --git a/app-emacs/teco/Manifest b/app-emacs/teco/Manifest
new file mode 100644
index 000000000000..49ba271d8936
--- /dev/null
+++ b/app-emacs/teco/Manifest
@@ -0,0 +1,6 @@
+AUX 50teco-gentoo.el 257 BLAKE2B 4abde23767cfa240b27e735158997eee8f91ea71893d398eacebacea28529c10bb6a61f66e602c362858878a54ecdafa3e071d232ac76c3edb61ef3ed9f31e19 SHA512 ab17c9541474290b9ea85d6788b54e5615b4ca93cb8194986950d285f744f614f8e598e6d5bf6441069f8274c7f012f9266178a104789488f88934ce1e2b0759
+AUX teco-7-emacs-24.patch 1350 BLAKE2B b5dd024ce4bfa4db7f7108756772ac3d7faf074260749af2254bff429cd4ac82c18b840f70e41f28e4ba0a2f342831374372695d4ea6c0f0030663e6aa6546f0 SHA512 71afdf37ab38e76181e1a7ce90a73ad31a625039d784b9334f79a8642a45c7922022f74231e8cf70cb6bcad023012412262d6ef840ac611a182e3eb48ee0f4e5
+AUX teco-7-minibuffer-prompt.patch 2574 BLAKE2B 93f031a0d59b7887251b5642d031a83ecf7f94a481e55804530fec5c2f6b8a80c16fecb53a3b1560c38c1f2c8de583c11cac3a721d3d84d04a083f1a1fd859eb SHA512 df67994df08353757cf7be3d8ebf0c0d6c048d8e195360d9f7afaa29ca44cd3ccbe95885d9c790a29c1965c3d291136e195fa076bf9a0a42304c46267ebb1446
+DIST teco-7.el.bz2 16372 BLAKE2B c5608c1546262b9dcb52e0c5f1e41c87e94f142a96e8ce1262201b00672d810c925c20090c36edc596e0fb362265e72861f4bc214cb13ed94fa71b586bc4f45d SHA512 7fb050d2d12aadeccc18d852b4191493be301c90ac5426ee4f985a89eba62f9b57d263a2156d5252e88d06bbe68508aca2bebeca65402ff9e8f00937f5189feb
+EBUILD teco-7-r1.ebuild 701 BLAKE2B 4a5416ad5446deb45609d0a530cee937b3ad480dd4e06b7f9b2085b68c7acfdedcf0aab5ef8806947a43298a904da3830deb02df70d6e19856be6442f0af4804 SHA512 c19c94c05c2e10d145e7a43ae2a900849950ec6a001fb09f2d1bb46a6b097e9c3212869a63e2ce614747ab6ed9a2f4b12058cf8a2c92b0352f3c453b7bd587a2
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/teco/files/50teco-gentoo.el b/app-emacs/teco/files/50teco-gentoo.el
new file mode 100644
index 000000000000..6992ef1e5735
--- /dev/null
+++ b/app-emacs/teco/files/50teco-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'teco:command "teco" "Read and execute a Teco command string." t)
+(autoload 'teco "teco" "Read and execute a Teco command string." t)
+(autoload 'teco:copy-to-q-reg "teco" "Copy region into Teco q-reg REG." t)
diff --git a/app-emacs/teco/files/teco-7-emacs-24.patch b/app-emacs/teco/files/teco-7-emacs-24.patch
new file mode 100644
index 000000000000..0b3251919ddb
--- /dev/null
+++ b/app-emacs/teco/files/teco-7-emacs-24.patch
@@ -0,0 +1,47 @@
+--- teco.el
++++ teco.el
+@@ -312,7 +312,7 @@
+ "Return string describing the version of Teco. When called interactively,
+ displays the version."
+ (interactive)
+- (if (interactive-p)
++ (if (called-interactively-p 'interactive)
+ (message "Teco version %s" (teco-version))
+ teco-version))
+
+@@ -2254,7 +2254,7 @@
+
+ (defun teco:command-self-insert ()
+ (interactive)
+- (teco:command-insert-character last-command-char))
++ (teco:command-insert-character last-command-event))
+
+ (defun teco:command-quit ()
+ (interactive)
+@@ -2267,7 +2267,7 @@
+
+ (defun teco:command-return ()
+ (interactive)
+- (setq last-command-char ?\n)
++ (setq last-command-event ?\n)
+ (teco:command-self-insert))
+
+ (defun teco:command-escape ()
+@@ -2275,7 +2275,7 @@
+ ;; Two ESCs in a row terminate the command string
+ (if (eq last-command 'teco:command-escape)
+ (throw 'teco:command-quit (minibuffer-contents-no-properties)))
+- (teco:command-insert-character last-command-char))
++ (teco:command-insert-character last-command-event))
+
+ (defun teco:command-ctrl-u ()
+ (interactive)
+@@ -2334,7 +2334,7 @@
+ ;; q-register
+ (progn
+ ;; insert the * into the buffer
+- (teco:command-insert-character last-command-char)
++ (teco:command-insert-character last-command-event)
+ ;; read the next character
+ (let ((c (read-char))
+ c1)
diff --git a/app-emacs/teco/files/teco-7-minibuffer-prompt.patch b/app-emacs/teco/files/teco-7-minibuffer-prompt.patch
new file mode 100644
index 000000000000..f46fadc98a39
--- /dev/null
+++ b/app-emacs/teco/files/teco-7-minibuffer-prompt.patch
@@ -0,0 +1,76 @@
+--- teco.el
++++ teco.el
+@@ -2213,9 +2213,11 @@
+ (define-key teco:command-keymap "/" 'teco:command-slash)
+ (define-key teco:command-keymap "*" 'teco:command-star)
+
+-(defvar teco:command-escapes nil
+- "Records where ESCs are, since they are represented in the command buffer
+-by $.")
++(defvar teco:command-display-table
++ (let ((table (make-display-table)))
++ (aset table ?\e [?$])
++ table)
++ "Display table used while reading teco commands.")
+
+ (defun teco:copy-to-q-reg (char start end)
+ "Copy region into Teco q-reg REG.
+@@ -2244,15 +2246,11 @@
+
+ (defun teco:read-command ()
+ "Read a teco command string from the user."
+- (let* ((teco:command-escapes nil)
+- (command (catch 'teco:command-quit
+- (read-from-minibuffer teco:prompt nil
+- teco:command-keymap))))
+- (if command
+- (while teco:command-escapes
+- (aset command (car teco:command-escapes) ?\e)
+- (setq teco:command-escapes (cdr teco:command-escapes))))
+- command))
++ (minibuffer-with-setup-hook
++ (lambda ()
++ (setq buffer-display-table teco:command-display-table))
++ (catch 'teco:command-quit
++ (read-from-minibuffer teco:prompt nil teco:command-keymap))))
+
+ (defun teco:command-self-insert ()
+ (interactive)
+@@ -2276,16 +2274,13 @@
+ (interactive)
+ ;; Two ESCs in a row terminate the command string
+ (if (eq last-command 'teco:command-escape)
+- (throw 'teco:command-quit (buffer-string)))
++ (throw 'teco:command-quit (minibuffer-contents-no-properties)))
+ (teco:command-insert-character last-command-char))
+
+ (defun teco:command-ctrl-u ()
+ (interactive)
+ ;; delete the characters
+ (kill-line 0)
+- ;; forget that they were ESCs
+- (while (and teco:command-escapes (<= (point) (car teco:command-escapes)))
+- (setq teco:command-escapes (cdr teco:command-escapes)))
+ ;; decide whether to shrink the window
+ (while (let ((a (insert ?\n))
+ (b (pos-visible-in-window-p))
+@@ -2297,9 +2292,6 @@
+ (interactive)
+ ;; delete the character
+ (backward-delete-char 1)
+- ;; forget that it was an ESC
+- (if (and teco:command-escapes (= (1- (point)) (car teco:command-escapes)))
+- (setq teco:command-escapes (cdr teco:command-escapes)))
+ ;; decide whether to shrink the window
+ (insert ?\n)
+ (if (prog1 (pos-visible-in-window-p)
+@@ -2362,9 +2354,6 @@
+
+ ;; Insert a single command character
+ (defun teco:command-insert-character (c)
+- (if (eq c ?\e)
+- (setq teco:command-escapes (cons (1- (point)) teco:command-escapes)
+- c ?$))
+ (insert c)
+ (if (not (pos-visible-in-window-p))
+ (enlarge-window 1)))
diff --git a/app-emacs/teco/metadata.xml b/app-emacs/teco/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/teco/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/teco/teco-7-r1.ebuild b/app-emacs/teco/teco-7-r1.ebuild
new file mode 100644
index 000000000000..ef2a0ac6508f
--- /dev/null
+++ b/app-emacs/teco/teco-7-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+DESCRIPTION="TECO interpreter for GNU Emacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/TECO"
+# taken from: http://www.emacswiki.org/emacs/teco.el
+SRC_URI="mirror://gentoo/${P}.el.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ELISP_PATCHES="${P}-minibuffer-prompt.patch
+ ${P}-emacs-24.patch"
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="To be able to invoke Teco directly, define a keybinding
+ for teco:command in your ~/.emacs file, e.g.:
+ \\n\\t(global-set-key \"\\C-z\" 'teco:command)
+ \\nSee ${SITELISP}/${PN}/teco.el for documentation."
diff --git a/app-emacs/template-3.1c-r1 b/app-emacs/template-3.1c-r1
deleted file mode 100644
index c8484140d43f..000000000000
--- a/app-emacs/template-3.1c-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Use templates, decorate comments, auto-update buffers
-EAPI=5
-HOMEPAGE=http://emacs-template.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://sourceforge/emacs-template/template-3.1c.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=b640653dd9ae778d130218a172fa782f
diff --git a/app-emacs/template/Manifest b/app-emacs/template/Manifest
new file mode 100644
index 000000000000..bde74f79bc64
--- /dev/null
+++ b/app-emacs/template/Manifest
@@ -0,0 +1,4 @@
+AUX 50template-gentoo.el 968 BLAKE2B ed1a12d4f1df94576e0ac7b03bc5a237ae0252ef247780c0fba30f2c4f4d5d72949a9dd9a32c7e91dc08db8e5175ab1138f4b3667397230171fc4d3c9fee79bf SHA512 a6c4fd122ae1daa7e0a07b259dba0581cdd7868d220c107c6979ef5f842659dc51c0573948979d9907241918686b48da4a89baff33abdcb12bfb30941a068396
+DIST template-3.1c.tar.gz 37903 BLAKE2B c6bcd602727d6a6bd60c1b26694b98b28f4f7c752c8c31cd2ad9359297265579b1317effadad956e5aba455b22714985367e84f3295528a1dcc09ff50bf9882d SHA512 d9fee39b67ff986d7c2dccbd09af3ce208f0e1a616a406fefefe4a6399f69a3527fa5609e87d41f7ceec5bf95818a62cb8da62994b28945998f8a9074821914c
+EBUILD template-3.1c-r1.ebuild 637 BLAKE2B c7650230d15b08ba5df4a15c027264bb6350fef406625a8d6c74fbf063c51a483f4566f7c6ae059ae1ad42a839148b6c4f379d1a9fed8c4b47a088cf740970de SHA512 601ef1ba2db841a2be31f8f0cb9049b5c4e596073284fedd82c79af20fb6ad42c145e64c8e61caa6bf14df0064e5414fbbf597e5a28497e9c1ca4461de6c01bc
+MISC metadata.xml 364 BLAKE2B 51a9622045ca4a82d2ba9387fbba67f0c0e42de533bf282b0484c0fdc1e2f9abce019cf26ab9319ab6f22d9064698299ef2a253517153e6f19f68594659b1730 SHA512 ad25ac4e50e673d017b8c85ac0d69c0794995a17a915fab741e97d966d0478d4523f833f890afeb2d4e0aa31907fb25fc505b282f95fd7a223c2902a0e0b2086
diff --git a/app-emacs/template/files/50template-gentoo.el b/app-emacs/template/files/50template-gentoo.el
new file mode 100644
index 000000000000..3da76196f42e
--- /dev/null
+++ b/app-emacs/template/files/50template-gentoo.el
@@ -0,0 +1,20 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'template-single-comment "template"
+ "Decorate the comment in the current line with dashes and alike." t)
+(autoload 'template-block-comment "template"
+ "Decorate the current block of comment-only lines with dashes and alike." t)
+(autoload 'template-update-header "template"
+ "Replace old file name in header with current file name." t)
+(autoload 'template-expand-template "template"
+ "Expand template file TEMPLATE and insert result in current buffer." t)
+(autoload 'template-new-file "template"
+ "Open a new file FILE by using a TEMPLATE." t)
+(autoload 'template-initialize "template"
+ "Initialized package template. See variable `template-initialize'." t)
+
+(setq template-default-directories
+ (list (if (and (not (file-directory-p "~/.templates/"))
+ (file-directory-p "~/lib/templates"))
+ (expand-file-name "~/lib/templates/")
+ (expand-file-name "~/.templates/"))
+ "@SITEETC@/templates"))
diff --git a/app-emacs/template/metadata.xml b/app-emacs/template/metadata.xml
new file mode 100644
index 000000000000..4af6ef4f062a
--- /dev/null
+++ b/app-emacs/template/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">emacs-template</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/template/template-3.1c-r1.ebuild b/app-emacs/template/template-3.1c-r1.ebuild
new file mode 100644
index 000000000000..4de14534d3c4
--- /dev/null
+++ b/app-emacs/template/template-3.1c-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Use templates, decorate comments, auto-update buffers"
+HOMEPAGE="http://emacs-template.sourceforge.net/"
+SRC_URI="mirror://sourceforge/emacs-template/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile lisp/*.el
+}
+
+src_install() {
+ elisp-install ${PN} lisp/*.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ insinto "${SITEETC}/${PN}"
+ doins -r templates
+ dodoc README lisp/ChangeLog
+}
diff --git a/app-emacs/tempo-snippets-0.1.5 b/app-emacs/tempo-snippets-0.1.5
deleted file mode 100644
index d2ed2e7a8c02..000000000000
--- a/app-emacs/tempo-snippets-0.1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Visual insertion of tempo templates
-EAPI=5
-HOMEPAGE=https://nschum.de/src/emacs/tempo-snippets/ https://www.emacswiki.org/emacs/TempoSnippets
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/tempo-snippets-0.1.5.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=a0ad0574231c6a1a06a1b7db2832b23e
diff --git a/app-emacs/tempo-snippets/Manifest b/app-emacs/tempo-snippets/Manifest
new file mode 100644
index 000000000000..4fcde0435f32
--- /dev/null
+++ b/app-emacs/tempo-snippets/Manifest
@@ -0,0 +1,4 @@
+AUX 50tempo-snippets-gentoo.el 88 BLAKE2B 4d62db9046a7412ab12728cb64a7c0afdbdaf1aeb35d209b977584046e1c7b97b1da834eaffa960a529f78e9b0ca366d70b55b729f3057ce78d911a2941fcfe2 SHA512 aaeaf81327283a4f482c08b6bf78f0e60154e76ec2df15aafb213b5d25d54778a26e204e0c5cc7816aa4a82add11e6291332cd1f6130c77be92b72406994e88e
+DIST tempo-snippets-0.1.5.el.bz2 5369 BLAKE2B d58073b1cd6585b76388f89470a0e5272e1f686a456ca7a7b7ae69e4a8aba81414c70c443be209eacd3b1404b21227330618e74c9f2f0056ba11b22933b6744c SHA512 77b739d3c9def0abc422daee372cdf5602ed79b7cb154125a0aa3ca99e24b025c070fbb8439638ce35849243efadc9cddf187debc53905242ab417ec79acacec
+EBUILD tempo-snippets-0.1.5.ebuild 423 BLAKE2B cadec630196ffbc48b3af61a4683e57ff7c8418f2a38a25200f21e4465f724ce11c937087370fa9171af13b3872320655e52e5f6d4b56816748d56d3dca2e2a9 SHA512 f63c8655904c44a518a3363290b2267b7592a751bbe95d4251e07d68750327b7be349163eebb025824e615f90c992be9531e02642841087ec8713ae325c57248
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/tempo-snippets/files/50tempo-snippets-gentoo.el b/app-emacs/tempo-snippets/files/50tempo-snippets-gentoo.el
new file mode 100644
index 000000000000..d35cc3e61bf0
--- /dev/null
+++ b/app-emacs/tempo-snippets/files/50tempo-snippets-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'tempo-define-snippet "tempo-snippets")
diff --git a/app-emacs/tempo-snippets/metadata.xml b/app-emacs/tempo-snippets/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/tempo-snippets/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/tempo-snippets/tempo-snippets-0.1.5.ebuild b/app-emacs/tempo-snippets/tempo-snippets-0.1.5.ebuild
new file mode 100644
index 000000000000..1442e9fd6e58
--- /dev/null
+++ b/app-emacs/tempo-snippets/tempo-snippets-0.1.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Visual insertion of tempo templates"
+HOMEPAGE="https://nschum.de/src/emacs/tempo-snippets/
+ https://www.emacswiki.org/emacs/TempoSnippets"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/thinks-1.9 b/app-emacs/thinks-1.9
deleted file mode 100644
index b2386a6875ab..000000000000
--- a/app-emacs/thinks-1.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Insert text in a think bubble
-EAPI=5
-HOMEPAGE=http://www.davep.org/emacs/
-KEYWORDS=alpha amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/thinks-1.9.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=3187dc02b666ec3c67d53769f239f9af
diff --git a/app-emacs/thinks/Manifest b/app-emacs/thinks/Manifest
new file mode 100644
index 000000000000..28d310a8bfdb
--- /dev/null
+++ b/app-emacs/thinks/Manifest
@@ -0,0 +1,4 @@
+AUX 50thinks-gentoo.el 852 BLAKE2B a7418e25b5dac4daed3c9e1e70b689dfa0a9f4087a605ff50ea5fffd25906df22400fcf77066f30c19057a83d8d78c3efd8ac110ef1b0f8d19db95ab2c8f080f SHA512 c82105986cd349a7716ac1ee1b54f16101719aa6f14a3485ec7942b8704c6fd748e5eba708064607c15a50158df64d7591af90a7bdb38ba7e0ed6c0811ca9897
+DIST thinks-1.9.el.bz2 2989 BLAKE2B 91fd4fe2b004625f758f0a3941228c0db6de37c637fcbf0456060e2a2f6e9c3618f6a815d9c649a87da286745f4831df21ebf225947d926f89ae20c49e3e8403 SHA512 ba85485df0decb2825a832b60b01a4ae8ef2e32dc356d16b770a4b59a795e138f3c26e14d8eb27e97038d10d2633945c7b2bd14933fdf7815f6c0abc07de5802
+EBUILD thinks-1.9.ebuild 407 BLAKE2B 6fbeafd2f21aa339197e2054b2379a16552d79ce88d6741323ff234a5839cb7af5f08528a8e3517e5032f15172c6f8ba171d9f2cc2a1f2925147ec9815fc4087 SHA512 1d6dc2def9daeb1fcc27568c46f93ed47f2270b7473788d05788446b63009022d5ec93e9ae99e5fbf7ee670644f385848a683f4da288966f0ce7941c7b374c24
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/thinks/files/50thinks-gentoo.el b/app-emacs/thinks/files/50thinks-gentoo.el
new file mode 100644
index 000000000000..e9b9968517ac
--- /dev/null
+++ b/app-emacs/thinks/files/50thinks-gentoo.el
@@ -0,0 +1,31 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload (quote thinks) "thinks" "\
+Insert TEXT wrapped in a think bubble.
+
+Prefix a call to this function with \\[universal-argument] if you don't want
+the text to be filled for you.
+
+\(fn TEXT)" t nil)
+
+(autoload (quote thinks-region) "thinks" "\
+Bubble wrap region bounding START and END.
+
+Prefix a call to this function with \\[universal-argument] if you don't want
+the text to be filled for you.
+
+\(fn START END)" t nil)
+
+(autoload (quote thinks-yank) "thinks" "\
+Do a `yank' and bubble wrap the yanked text.
+
+Prefix a call to this function with \\[universal-argument] if you don't want
+the text to be filled for you.
+
+\(fn)" t nil)
+
+(autoload (quote thinks-maybe-region) "thinks" "\
+If region is active, bubble wrap region bounding START and END.
+If not, query for text to insert in bubble.
+
+\(fn)" t nil)
diff --git a/app-emacs/thinks/metadata.xml b/app-emacs/thinks/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/thinks/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/thinks/thinks-1.9.ebuild b/app-emacs/thinks/thinks-1.9.ebuild
new file mode 100644
index 000000000000..4471d2d43248
--- /dev/null
+++ b/app-emacs/thinks/thinks-1.9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Insert text in a think bubble"
+HOMEPAGE="http://www.davep.org/emacs/"
+# taken from http://www.davep.org/emacs/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/thumbs-2.0-r1 b/app-emacs/thumbs-2.0-r1
deleted file mode 100644
index 02553fe97699..000000000000
--- a/app-emacs/thumbs-2.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs thumbnail previewer for image files
-EAPI=4
-HOMEPAGE=https://www.emacswiki.org/emacs/ThumbsMode
-KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/imagemagick-tools >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/thumbs-2.0.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=59ed0a3153f789077c1ad81dfc262b5c
diff --git a/app-emacs/thumbs/Manifest b/app-emacs/thumbs/Manifest
new file mode 100644
index 000000000000..815c1ca8f0ea
--- /dev/null
+++ b/app-emacs/thumbs/Manifest
@@ -0,0 +1,4 @@
+AUX 50thumbs-gentoo.el 583 BLAKE2B 52d510b9eaf45096d2f19dfdfddd1c8be31fa4edc698d5525ed8b2a0c2f9af258ecad323ca781a318c462319f6c31a113c486bd230dc208c489a720022af053a SHA512 dc608706b845acaa68c7a3ae62495adb43d918523d9e68c521173a6b28962cc438359147b7918e001d68d6d9e11365c1e9d3557464497a258ab168adc28e993e
+DIST thumbs-2.0.el.bz2 6521 BLAKE2B f37154658fdc660698a28ac01d0b266ff6cc4f86f30d93a9e0929e565a6666ccd168d861122d5ff893073f9aaa4a3c7412a3f96758b044faad11f13ec7000533 SHA512 d4bca861ed5db620a2319659e255bef14241a68067be994402d2d36bb7fe34ab5a22b6b76dea5631aa5288d03caadb3a8163a8ecf439144d8d50cc410cfe078d
+EBUILD thumbs-2.0-r1.ebuild 412 BLAKE2B 7f5023ce0234efb6ca2d8702c2f3827e8900b6ceeee57dd46f09a57c121a0cbc44b9a80eccb63d1b7722f5237335f45d3ac1d0de0b8d90cd8aabdeee72d48153 SHA512 02317700e3d1a2f18532b03666e93150d2e33dd12eb2d2c3186c42a7f0ad9f4c9c93b7675b37f31bc3492ce26412ec892d553f3d9be84eb18010084eadb51ebf
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/thumbs/files/50thumbs-gentoo.el b/app-emacs/thumbs/files/50thumbs-gentoo.el
new file mode 100644
index 000000000000..12627d30c75e
--- /dev/null
+++ b/app-emacs/thumbs/files/50thumbs-gentoo.el
@@ -0,0 +1,11 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'thumbs-find-thumb "thumbs" "Display the thumbnail for IMG." t)
+(autoload 'thumbs-show-all-from-dir "thumbs"
+ "Make a preview buffer for all images in DIR." t)
+(autoload 'thumbs-dired-show-marked "thumbs"
+ "In Dired, make a thumbs buffer with all marked files." t)
+(autoload 'thumbs-dired-show-all "thumbs"
+ "In dired, make a thumbs buffer with all files in current directory." t)
+(defalias 'thumbs 'thumbs-show-all-from-dir)
+(autoload 'thumbs-dired-setroot "thumbs"
+ "In dired, Call the setroot program on the image at point." t)
diff --git a/app-emacs/thumbs/metadata.xml b/app-emacs/thumbs/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/thumbs/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/thumbs/thumbs-2.0-r1.ebuild b/app-emacs/thumbs/thumbs-2.0-r1.ebuild
new file mode 100644
index 000000000000..85ffa7643736
--- /dev/null
+++ b/app-emacs/thumbs/thumbs-2.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Emacs thumbnail previewer for image files"
+HOMEPAGE="https://www.emacswiki.org/emacs/ThumbsMode"
+SRC_URI="mirror://gentoo/${P}.el.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
+
+RDEPEND="virtual/imagemagick-tools"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/tuareg-mode-2.0.10 b/app-emacs/tuareg-mode-2.0.10
deleted file mode 100644
index 9cba6f446b84..000000000000
--- a/app-emacs/tuareg-mode-2.0.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Objective Caml/Camllight mode for Emacs
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/tuareg/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/ocaml/tuareg/archive/2.0.10.tar.gz -> tuareg-mode-2.0.10.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=6cb95f0709d0f461d48fa7852a05db25
diff --git a/app-emacs/tuareg-mode-2.0.7 b/app-emacs/tuareg-mode-2.0.7
deleted file mode 100644
index aabd777b925d..000000000000
--- a/app-emacs/tuareg-mode-2.0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Objective Caml/Camllight mode for Emacs
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/tuareg/
-KEYWORDS=amd64 ppc x86 ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://forge.ocamlcore.org/frs/download.php/1304/tuareg-2.0.7.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=afdf53769bda7c55d8abf03dba8f93ce
diff --git a/app-emacs/tuareg-mode-2.0.8 b/app-emacs/tuareg-mode-2.0.8
deleted file mode 100644
index 5162ebbd297c..000000000000
--- a/app-emacs/tuareg-mode-2.0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Objective Caml/Camllight mode for Emacs
-EAPI=5
-HOMEPAGE=http://forge.ocamlcore.org/projects/tuareg/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/ocaml/tuareg/releases/download/2.0.8/tuareg-2.0.8.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=074873e1907f2bb1248c5bafd187dc53
diff --git a/app-emacs/tuareg-mode/Manifest b/app-emacs/tuareg-mode/Manifest
new file mode 100644
index 000000000000..f7230682298b
--- /dev/null
+++ b/app-emacs/tuareg-mode/Manifest
@@ -0,0 +1,8 @@
+AUX 50tuareg-mode-gentoo.el 343 BLAKE2B 15545f9aebe6b47e6fa445e32282c4dadf8a6d3fc11d3cb9f8dd2a78ef32dfa5227248644dee8ad12587d96e2c17bf16220a92f447edf8716cd7646347fc2c57 SHA512 41cdc5aa7c083afbe044c730b898e06817fb8c5d9799d0c88be9ad15501d4135e16597623b66ae65a40160d9a04358392a98e03646ba2207e0f981f33e28750d
+DIST tuareg-2.0.7.tar.gz 57999 BLAKE2B 12649da41c8bbc547d28fe391cec51ca552dd66bb1fbf052a9d44d693b9df45ac6dc10336e146109248b130ea7ba94f7097398b598f3a7eb113b0031eea83486 SHA512 6cf290879dd9b7993a046dbebb9944a245fa82d1e7849b46f477b7217b46026ce5195e40e4d9b990e047a03680197827334e6d54d82610da6fc2e62386357d42
+DIST tuareg-2.0.8.tar.gz 57777 BLAKE2B 38d401319640ab4e691ccdbbca03c95b3bd03189aa2399a7258cfcd6660b0c30e7931072ec791ae000ceb228bb8195bd96c6b681a53e3c4cbb861037ab0f7678 SHA512 c9e268eb550fd36614e6632335b623a0916d64dd84a0259fd83c6f08e3138196d3871bc7664d6debe62732d4459130ef1e9271b24982138ff69d90442d031990
+DIST tuareg-mode-2.0.10.tar.gz 102576 BLAKE2B fac81b5f43dc9143a62fe7ebf5d35bc44994db3a155b780329339b73b087cf53e63aa15b7e817388a92f1effcc08febc617747b242d57d5e900b20fe100a8f03 SHA512 53bdc3b2b78bcf7e6b075932b9319f9d08b02b4b3fd74fc9aa30b390b30e4069e19e09e0fbb03fb11877e6d89649b8e59c645cc8de196115c1bbdab308145743
+EBUILD tuareg-mode-2.0.10.ebuild 461 BLAKE2B 5b5bb6cbb0d25fb99e0dd82d8fd09a6b80c4622a72effc589f054b5223ca0a77344b88f27d7ff17665cb69a42f4b939c40afae2ebc125624d271e1d11725b10c SHA512 d4c20260eba3b5151d2d550e0f75e910c9f40e1a47cf96a8e548bdab2074dbd3351709be1b1c3fe32b97c57eaf5cf58bc3ead1eb35c10c472aa7eff313f68337
+EBUILD tuareg-mode-2.0.7.ebuild 505 BLAKE2B 7dd6a1e0c7da751aff504724d03892385c73bfc4afbc52f4ff997040ea67e5c413b2e0b108bba8c19f062b8dac301f0be4aa21186538cf63bf2486900caff277 SHA512 5a982624d089ce91f1b31f20f65f295c9d8cda900888007f41b498ac70b8282edd61000206d8dcdcd000a7a95ac5de3e7d2ac58981e95391131aacce47dc29cd
+EBUILD tuareg-mode-2.0.8.ebuild 518 BLAKE2B 7a3276f4a662c2d51bee7c3f7f731780ae1ecc2c5748708323db075e63b0cf1e0d0e56c8456d10d1a7d7bce762490577a4c9da318132bbcabd4309e56b046a66 SHA512 b61c58e72b5d207a85bfeebf2e94d01451ad74192c8d2f8431780f23ef02658794e72b5c2309cb925063482fb055f30de42637160ff016e9891ca40c14432435
+MISC metadata.xml 780 BLAKE2B 9262902650dea63fa833d0b57f32054a6858e741f404d6f5393273518533e9008ec8a322ec013232b69e8475d9db7f407f3985477ce4449e08913e0eed84337c SHA512 480ad1fcd7b12c56081dac425686a17ad07d912c4ac0f5f259c126d4a07489d9660e1429a7f0570aac3957ec8712d406314d68c76cd45dd8ec99a7f62dba6c5d
diff --git a/app-emacs/tuareg-mode/files/50tuareg-mode-gentoo.el b/app-emacs/tuareg-mode/files/50tuareg-mode-gentoo.el
new file mode 100644
index 000000000000..7e970412ac37
--- /dev/null
+++ b/app-emacs/tuareg-mode/files/50tuareg-mode-gentoo.el
@@ -0,0 +1,6 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'tuareg-mode "tuareg" "Major mode for editing Caml code" t)
+(autoload 'tuareg-run-ocaml "tuareg" "Run an OCaml toplevel process." t)
+(autoload 'ocamldebug "ocamldebug" "Run the Caml debugger" t)
+(defalias 'camldebug 'ocamldebug)
+(add-to-list 'auto-mode-alist '("\\.ml[iylp]?\\'" . tuareg-mode))
diff --git a/app-emacs/tuareg-mode/metadata.xml b/app-emacs/tuareg-mode/metadata.xml
new file mode 100644
index 000000000000..de72ddb18e30
--- /dev/null
+++ b/app-emacs/tuareg-mode/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+<longdescription>
+ Tuareg is an Object Caml/Camllight mode for Emacs. It handles automatic
+ indentation and syntax highlighting of code. It also supports an interactive
+ Caml top-level and debugger. Tuareg attempts to do a better job than the
+ Emacs mode distributed with the OCaml 3.x source.
+</longdescription>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">ocaml/tuareg</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/tuareg-mode/tuareg-mode-2.0.10.ebuild b/app-emacs/tuareg-mode/tuareg-mode-2.0.10.ebuild
new file mode 100644
index 000000000000..0f3e6123136f
--- /dev/null
+++ b/app-emacs/tuareg-mode/tuareg-mode-2.0.10.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
+HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
+SRC_URI="https://github.com/ocaml/tuareg/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+S="${WORKDIR}/tuareg-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emacs/tuareg-mode/tuareg-mode-2.0.7.ebuild b/app-emacs/tuareg-mode/tuareg-mode-2.0.7.ebuild
new file mode 100644
index 000000000000..5eddbb053a51
--- /dev/null
+++ b/app-emacs/tuareg-mode/tuareg-mode-2.0.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
+HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1304/tuareg-${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+
+S="${WORKDIR}/tuareg-${PV}"
+ELISP_REMOVE="tuareg-pkg.el tuareg-site-file.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README"
diff --git a/app-emacs/tuareg-mode/tuareg-mode-2.0.8.ebuild b/app-emacs/tuareg-mode/tuareg-mode-2.0.8.ebuild
new file mode 100644
index 000000000000..c2eb95e0e14e
--- /dev/null
+++ b/app-emacs/tuareg-mode/tuareg-mode-2.0.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
+HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
+SRC_URI="https://github.com/ocaml/tuareg/releases/download/${PV}/tuareg-${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+S="${WORKDIR}/tuareg-${PV}"
+ELISP_REMOVE="tuareg-pkg.el tuareg-site-file.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emacs/twittering-mode-2.0.0 b/app-emacs/twittering-mode-2.0.0
deleted file mode 100644
index 0589c5b91ef4..000000000000
--- a/app-emacs/twittering-mode-2.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major mode for Twitter
-EAPI=6
-HOMEPAGE=http://twmode.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/twmode/twittering-mode-2.0.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=627ba6b052ce20c6d7f16036f942469f
diff --git a/app-emacs/twittering-mode-3.0.0 b/app-emacs/twittering-mode-3.0.0
deleted file mode 100644
index 3798da813aa7..000000000000
--- a/app-emacs/twittering-mode-3.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major mode for Twitter
-EAPI=6
-HOMEPAGE=http://twmode.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg >=virtual/emacs-23
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/twmode/twittering-mode-3.0.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=627ba6b052ce20c6d7f16036f942469f
diff --git a/app-emacs/twittering-mode-9999 b/app-emacs/twittering-mode-9999
deleted file mode 100644
index 5dc0eaab3dce..000000000000
--- a/app-emacs/twittering-mode-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=virtual/emacs-23 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Emacs major mode for Twitter
-EAPI=6
-HOMEPAGE=http://twmode.sourceforge.net/
-IUSE=doc
-LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg >=virtual/emacs-23
-SLOT=0
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=627ba6b052ce20c6d7f16036f942469f
diff --git a/app-emacs/twittering-mode/Manifest b/app-emacs/twittering-mode/Manifest
new file mode 100644
index 000000000000..84627c583bc5
--- /dev/null
+++ b/app-emacs/twittering-mode/Manifest
@@ -0,0 +1,6 @@
+DIST twittering-mode-2.0.0.tar.gz 615223 BLAKE2B 1fc5ceb440ac9a00dde4d49cd48580d3e8f78ed2e9bccb8b2dcf41c6be1c7e0394c8db958e6ab4ac632b91bbdfc9a0930ad3867584d642b3f90b15a7bc0132d5 SHA512 318768c54c99c03c7641bfeb8396fdcaf65752121da6a64e6af9c071b6c429f73e44d1698df600915c4c7042233ef96cf86c037eece21b00d8e52a01ae569601
+DIST twittering-mode-3.0.0.tar.gz 1363235 BLAKE2B 31801fcb339cab42c7b9a9bfb186ef6a21570be16dd90d36baaabe97ec9fc93bdc35ead707e366e7262347158da145c04a6f51340abd3386b8c2a9fd8b5d417b SHA512 c696a8f31abcf6944c127575719d3e9b24a2bfb6271e0193e2a6faa8137c6468c7686b88d1e4ec0c3cc3b833e26853b435726d1acb422e9f37d3c0334e278494
+EBUILD twittering-mode-2.0.0.ebuild 820 BLAKE2B e6ce259b52aed7bcc00f550cf4f92d9bf0a5fb826e4fc785f62f1fab62a93e3cbc8228fcc5e5a001bbece49907e65981a9d531192185399720269fd05f2ee64e SHA512 71dacc1eb3d71a1245b68499ebd092befb8c9b6dda1472b6cbef068860840b9b66b4aec03abe5d5bf778089555ceba14c690301041c98df885c294752a03a464
+EBUILD twittering-mode-3.0.0.ebuild 820 BLAKE2B e6ce259b52aed7bcc00f550cf4f92d9bf0a5fb826e4fc785f62f1fab62a93e3cbc8228fcc5e5a001bbece49907e65981a9d531192185399720269fd05f2ee64e SHA512 71dacc1eb3d71a1245b68499ebd092befb8c9b6dda1472b6cbef068860840b9b66b4aec03abe5d5bf778089555ceba14c690301041c98df885c294752a03a464
+EBUILD twittering-mode-9999.ebuild 820 BLAKE2B e6ce259b52aed7bcc00f550cf4f92d9bf0a5fb826e4fc785f62f1fab62a93e3cbc8228fcc5e5a001bbece49907e65981a9d531192185399720269fd05f2ee64e SHA512 71dacc1eb3d71a1245b68499ebd092befb8c9b6dda1472b6cbef068860840b9b66b4aec03abe5d5bf778089555ceba14c690301041c98df885c294752a03a464
+MISC metadata.xml 431 BLAKE2B 99dcd39c66412decdb967fc8670d117b209fe90eee8d5c17dbbf3f3653fecdb328ce459c72488b8d62f618570f194d9afa831669838976ea08ec9784fd99fd43 SHA512 699cfac367110e5031fe8cf1aabc64369185f435e6ca78d89b97f184c6e77b1d91a0e2012b03709c548afa9489e1b41e5bf0a40d83074c5517bb79b0d302005f
diff --git a/app-emacs/twittering-mode/metadata.xml b/app-emacs/twittering-mode/metadata.xml
new file mode 100644
index 000000000000..cbc48ff047d0
--- /dev/null
+++ b/app-emacs/twittering-mode/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>naota@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">twmode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild b/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild
new file mode 100644
index 000000000000..1e802fc217fc
--- /dev/null
+++ b/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp elisp-common eutils
+
+if [[ ${PV} == *9999 ]]; then
+ EGIT_REPO_URI="https://github.com/hayamiz/twittering-mode.git"
+ inherit git-r3
+ IUSE="doc"
+else
+ SRC_URI="mirror://sourceforge/twmode/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ RESTRICT="test"
+ IUSE=""
+fi
+
+DESCRIPTION="Emacs major mode for Twitter"
+HOMEPAGE="http://twmode.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="app-crypt/gnupg"
+
+src_compile() {
+ elisp-compile twittering-mode.el || die
+ [[ ${PV} == *9999 ]] && use doc && emake -C doc/manual
+}
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ [[ ${PV} == *9999 ]] && use doc && dodoc doc/manual/twmode/twmode.html
+ elisp-install ${PN} twittering-mode.el *.elc || die
+}
diff --git a/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild b/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild
new file mode 100644
index 000000000000..1e802fc217fc
--- /dev/null
+++ b/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp elisp-common eutils
+
+if [[ ${PV} == *9999 ]]; then
+ EGIT_REPO_URI="https://github.com/hayamiz/twittering-mode.git"
+ inherit git-r3
+ IUSE="doc"
+else
+ SRC_URI="mirror://sourceforge/twmode/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ RESTRICT="test"
+ IUSE=""
+fi
+
+DESCRIPTION="Emacs major mode for Twitter"
+HOMEPAGE="http://twmode.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="app-crypt/gnupg"
+
+src_compile() {
+ elisp-compile twittering-mode.el || die
+ [[ ${PV} == *9999 ]] && use doc && emake -C doc/manual
+}
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ [[ ${PV} == *9999 ]] && use doc && dodoc doc/manual/twmode/twmode.html
+ elisp-install ${PN} twittering-mode.el *.elc || die
+}
diff --git a/app-emacs/twittering-mode/twittering-mode-9999.ebuild b/app-emacs/twittering-mode/twittering-mode-9999.ebuild
new file mode 100644
index 000000000000..1e802fc217fc
--- /dev/null
+++ b/app-emacs/twittering-mode/twittering-mode-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp elisp-common eutils
+
+if [[ ${PV} == *9999 ]]; then
+ EGIT_REPO_URI="https://github.com/hayamiz/twittering-mode.git"
+ inherit git-r3
+ IUSE="doc"
+else
+ SRC_URI="mirror://sourceforge/twmode/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ RESTRICT="test"
+ IUSE=""
+fi
+
+DESCRIPTION="Emacs major mode for Twitter"
+HOMEPAGE="http://twmode.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=""
+RDEPEND="app-crypt/gnupg"
+
+src_compile() {
+ elisp-compile twittering-mode.el || die
+ [[ ${PV} == *9999 ]] && use doc && emake -C doc/manual
+}
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ [[ ${PV} == *9999 ]] && use doc && dodoc doc/manual/twmode/twmode.html
+ elisp-install ${PN} twittering-mode.el *.elc || die
+}
diff --git a/app-emacs/typing-1.1.4 b/app-emacs/typing-1.1.4
deleted file mode 100644
index 70a969c2b0e6..000000000000
--- a/app-emacs/typing-1.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=The Typing of Emacs -- an Elisp parody of The Typing of the Dead for Dreamcast
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/TypingOfEmacs
-KEYWORDS=amd64 ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/typing-1.1.4.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=ef3e908bcaa24c775e4791f433218148
diff --git a/app-emacs/typing/Manifest b/app-emacs/typing/Manifest
new file mode 100644
index 000000000000..37a4a92cf46e
--- /dev/null
+++ b/app-emacs/typing/Manifest
@@ -0,0 +1,4 @@
+AUX 50typing-gentoo.el 114 BLAKE2B 0e859757e9608b619a5e28594562d5f8e55590c81b3949a5a25cbaa47b684430091fc6d1c377cdec85acae1e79556a74fca7ed34d626a79c5df9a2662f0adaef SHA512 05981cefaa046c00c1ca4c06af0c7be2a1b7bec87c7626f12f87ea5be7eb6df778e2559ddcbffcc8760224845a24d2f5e9887f8b7e53565881ff9c8632923371
+DIST typing-1.1.4.el.xz 5092 BLAKE2B 4126cc2ff0666688cdd80b4ed83675a62ed089fa69fb7a780ee58485d1832d8cbf039b0dec2d1ebcae5f71b156a5fb485c930452dcc5b27d6513c10155ed99b2 SHA512 9033b4ca2d23de98f8721796c708392b97d49b6719544ad4ee6d73f11ef253600d9c2a0d2b8ea89ef58355d1bfa36244ccd527994170ae0f43404c6ac19b62f3
+EBUILD typing-1.1.4.ebuild 424 BLAKE2B 7c2e9e4b4c8c375065bb0052ce8f2ba0906daa3e983ddf2c057c23f8a9d62c7ef7fc856dc096960d7535ba4d57651a6e65a6ed20680fbce22a62a8694dd8c97d SHA512 8edb7f3c1d111eccb1f8a8e0187fe238d779f9ccd398934cc2822f4a4a77ad47af27cb51cca37998bfafe78bb2db717fd8f92e4ebe7d7d90e8589410ff66b03f
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/typing/files/50typing-gentoo.el b/app-emacs/typing/files/50typing-gentoo.el
new file mode 100644
index 000000000000..20dbe6dea160
--- /dev/null
+++ b/app-emacs/typing/files/50typing-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'typing-of-emacs "typing" "Play the game The Typing Of Emacs." t)
diff --git a/app-emacs/typing/metadata.xml b/app-emacs/typing/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/typing/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/typing/typing-1.1.4.ebuild b/app-emacs/typing/typing-1.1.4.ebuild
new file mode 100644
index 000000000000..601df8fc80ba
--- /dev/null
+++ b/app-emacs/typing/typing-1.1.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="The Typing of Emacs -- an Elisp parody of The Typing of the Dead for Dreamcast"
+HOMEPAGE="https://www.emacswiki.org/emacs/TypingOfEmacs"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/uboat-1.2 b/app-emacs/uboat-1.2
deleted file mode 100644
index 95e4b0851336..000000000000
--- a/app-emacs/uboat-1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Generate u-boat-death messages, patterned after Iron Coffins
-EAPI=5
-HOMEPAGE=http://www.splode.com/~friedman/software/emacs-lisp/
-KEYWORDS=amd64 ppc x86
-LICENSE=public-domain
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/uboat-1.2.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=a4edd7440c098542e65aafc1df3ffef6
diff --git a/app-emacs/uboat/Manifest b/app-emacs/uboat/Manifest
new file mode 100644
index 000000000000..6c622b49a46e
--- /dev/null
+++ b/app-emacs/uboat/Manifest
@@ -0,0 +1,4 @@
+AUX 50uboat-gentoo.el 84 BLAKE2B a4fa581b5fc4982886363b0c823b9ea497e1450666f5878104976b6ba82d7248685e7421601847a9d9929fdeb56d6febd9399a9b780d998887685d0136e5b3ce SHA512 fc349a5f8751437d03975fe2dd93c754ea29a164b626726f724e26b8bfd0f1c96098f471086443e46d95fa9fd4d06da12174305c0327fb06396362fa847a0574
+DIST uboat-1.2.tar.bz2 1978 BLAKE2B c40c054863d5d13a415355144d216bb03e34205ba65853669758d8e2c44de34534a8460f1c5f6a4dd25543e9d2d0c2f3df5ec3b7146348b616ed2a88ca6b5cd6 SHA512 f77de2c0859a5eb8c09f03aea5be068e2f61f96e10c72d9f18ec6c3fdcc19ab7ca62d606d06aa669b07a89e9f677f5bcb6d3e211b7b7710840cacf9d4f3e307c
+EBUILD uboat-1.2.ebuild 478 BLAKE2B 1abab402be73dc4328b4eac751b12f44ad5f57c8efebdd1f80ed6c628a9de15b0a075f362ecdc8e9c07e2b4a5d6399284cf520ca258f06af2120619194b98371 SHA512 3068ea3e7ba4a6c8e3a9e0be800818c355d1d41e7f23a76fba0bd38fc04cb2a93f523a225b232b4a3dac47a5d6362e2c288ef81ed9df78ff9a847c5d8b9e2dcd
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/uboat/files/50uboat-gentoo.el b/app-emacs/uboat/files/50uboat-gentoo.el
new file mode 100644
index 000000000000..79bff147aba3
--- /dev/null
+++ b/app-emacs/uboat/files/50uboat-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'uboat-death-message "uboat" nil t)
diff --git a/app-emacs/uboat/metadata.xml b/app-emacs/uboat/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/uboat/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/uboat/uboat-1.2.ebuild b/app-emacs/uboat/uboat-1.2.ebuild
new file mode 100644
index 000000000000..772dd4957e9c
--- /dev/null
+++ b/app-emacs/uboat/uboat-1.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Generate u-boat-death messages, patterned after Iron Coffins"
+HOMEPAGE="http://www.splode.com/~friedman/software/emacs-lisp/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+# Noah Friedman and Bob Manson have confirmed that this is in the public domain
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/undo-tree-0.5.2 b/app-emacs/undo-tree-0.5.2
deleted file mode 100644
index 2fe00a68efb3..000000000000
--- a/app-emacs/undo-tree-0.5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Undo trees and visualization
-EAPI=4
-HOMEPAGE=http://www.dr-qubit.org/emacs.php#undo-tree
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/undo-tree-0.5.2.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=d809c42aadd46ff17f447d431246d29e
diff --git a/app-emacs/undo-tree-0.6.4 b/app-emacs/undo-tree-0.6.4
deleted file mode 100644
index 7bef782b7861..000000000000
--- a/app-emacs/undo-tree-0.6.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-24
-DESCRIPTION=Undo trees and visualization
-EAPI=4
-HOMEPAGE=http://www.dr-qubit.org/emacs.php#undo-tree
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-24
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/undo-tree-0.6.4.el.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=945a2843d5143bc0ecf8745e1db04e26
diff --git a/app-emacs/undo-tree/Manifest b/app-emacs/undo-tree/Manifest
new file mode 100644
index 000000000000..6f844eea8ac7
--- /dev/null
+++ b/app-emacs/undo-tree/Manifest
@@ -0,0 +1,6 @@
+AUX 50undo-tree-gentoo.el 176 BLAKE2B 4b6922264c736a25a04cf337ccd897b2869594b53ef6c5b4ebba1055ef9affd50d702bf6966b6e8009be4c769c5504c1e099a57320122eb2002d68e351cb0ffc SHA512 bdd1399c0dab9cf7a5f86f41d77062eec5aca2171f1e78f5822f11e2ae5cf9581a1646cc6e3a6e3a53b8835a11e13f04d8c8accdc0d6fadf63f22056bdfe8476
+DIST undo-tree-0.5.2.el.bz2 27985 BLAKE2B a9c4fe9a1cf245278f88df97d6269c81a3ebae9d10a62b8390805c06636516fb7163dc5b4cfc81463e0b45f9cd04664b8aa5c86c3ebb56a7f07e86ee45f0305c SHA512 62b355cbebd4e17a59b70acdae69bdddc9a6fd57d5c684d0560eb03dfac69121bc63941ef6520853b174a6de0a5ae54dc4f240a55f0623312a86e799ea3785d0
+DIST undo-tree-0.6.4.el.xz 31124 BLAKE2B a81bb93489189d04ea81b98912fef6b7a6903f24548dcf9a9f44decc77e3219dd233d2d91c1c6c32047565297aa8583c09dc451ca060a10b52fc7b4e85d32b2d SHA512 e7017b23cceaf544de855bb21059959df539f5380db9c15b62f171d037b6ebb2d31f86f7ab3b724b048dafddfc3d2ace65dfac84c3eb0f6847489afb7f4b99cc
+EBUILD undo-tree-0.5.2.ebuild 507 BLAKE2B 0f03898bbb58cec48d3f40ffdbbadec6d6b5ff2c441cfb9a756d1077b318652c655801183d0bdb7509cef5a6374674d9f6e4f1b1bacf5b24c4e354186045c2b5 SHA512 1dc62b5cffeff5305e7cc5d9a012f831111f469807d642fb7aa0d60a1655fe47be5a5c1d25d5d450709fd7d33b78b7a1e4750e7667f8548e6b8eb97d66224083
+EBUILD undo-tree-0.6.4.ebuild 494 BLAKE2B 71b3ab49aec70c7cb78af8d34bd604b66bfeb654a341aa62042b3539c67ed8746ce236615b12ab1eb2e648efebd709a65bc1205ced54b859fcf5a6e7f20c558e SHA512 5a6673e884ce120238b3a15b699cc668f494b1521f2a313c32a8747b502a1c2b7ac480fb9dbcd3d03c24e4e80e4e1f4a67fb54283ef1bd4982595ea4f46be78d
+MISC metadata.xml 1615 BLAKE2B de03d03f942a062e9f6e7321e1e83b9a95d99999f203ac3a054ffe09079ac6de4767a5b52a1320f7d977125a1a461a9fb8b2a7ddfc8fddf361d23815ab5bfb53 SHA512 e9911761e904a9bbbb948db7c91fddfc60858afe46aeb9023e9c737a4e7d1922435023a723d2bc54a7e4098080564f056e4bd8a231e187b70fb652d48ed14eca
diff --git a/app-emacs/undo-tree/files/50undo-tree-gentoo.el b/app-emacs/undo-tree/files/50undo-tree-gentoo.el
new file mode 100644
index 000000000000..faba34afbe35
--- /dev/null
+++ b/app-emacs/undo-tree/files/50undo-tree-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'undo-tree-mode "undo-tree" "Enable undo-trees" t)
+(autoload 'global-undo-tree-mode "undo-tree" "Enable undo-trees globally" t)
diff --git a/app-emacs/undo-tree/metadata.xml b/app-emacs/undo-tree/metadata.xml
new file mode 100644
index 000000000000..7503cd81fafd
--- /dev/null
+++ b/app-emacs/undo-tree/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 type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription lang="en">
+ Emacs has a powerful undo system. Unlike the standard undo/redo system in
+ most software, it allows you to recover *any* past state of a buffer
+ (whereas the standard undo/redo system can lose past states as soon as you
+ redo). However, this power comes at a price: many people find Emacs' undo
+ system confusing and difficult to use, spawning a number of packages that
+ replace it with the less powerful but more intuitive undo/redo system.
+
+ Both the loss of data with standard undo/redo, and the confusion of Emacs'
+ undo, stem from trying to treat undo history as a linear sequence of
+ changes. It's not. The `undo-tree-mode' provided by this package replaces
+ Emacs' undo system with a system that treats undo history as what it is: a
+ branching tree of changes. This simple idea allows the more intuitive
+ behaviour of the standard undo/redo system to be combined with the power of
+ never losing any history. An added side bonus is that undo history can in
+ some cases be stored more efficiently, allowing more changes to accumulate
+ before Emacs starts discarding history.
+
+ The only downside to this more advanced yet simpler undo system is that it
+ was inspired by Vim. But, after all, most successful religions steal the
+ best ideas from their competitors!
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/undo-tree/undo-tree-0.5.2.ebuild b/app-emacs/undo-tree/undo-tree-0.5.2.ebuild
new file mode 100644
index 000000000000..1fb2bef3be2b
--- /dev/null
+++ b/app-emacs/undo-tree/undo-tree-0.5.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="Undo trees and visualization"
+HOMEPAGE="http://www.dr-qubit.org/emacs.php#undo-tree"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_postinst() {
+ elisp-site-regen
+ elog "To enable undo trees globally, place '(global-undo-tree-mode)'"
+ elog "in your .emacs file."
+}
diff --git a/app-emacs/undo-tree/undo-tree-0.6.4.ebuild b/app-emacs/undo-tree/undo-tree-0.6.4.ebuild
new file mode 100644
index 000000000000..209e6773cb3a
--- /dev/null
+++ b/app-emacs/undo-tree/undo-tree-0.6.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+NEED_EMACS=24
+
+inherit readme.gentoo elisp
+
+DESCRIPTION="Undo trees and visualization"
+HOMEPAGE="http://www.dr-qubit.org/emacs.php#undo-tree"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="To enable undo trees globally, place '(global-undo-tree-mode)'
+ in your .emacs file."
diff --git a/app-emacs/uptimes-2.3-r2 b/app-emacs/uptimes-2.3-r2
deleted file mode 100644
index fb23bfbe556d..000000000000
--- a/app-emacs/uptimes-2.3-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Track and display emacs session uptimes
-EAPI=5
-HOMEPAGE=http://www.davep.org/emacs/
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/uptimes-2.3.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1011ae0c1861069d51b9571421a282bf
diff --git a/app-emacs/uptimes/Manifest b/app-emacs/uptimes/Manifest
new file mode 100644
index 000000000000..542663ed77f2
--- /dev/null
+++ b/app-emacs/uptimes/Manifest
@@ -0,0 +1,4 @@
+AUX 50uptimes-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST uptimes-2.3.tar.bz2 3637 BLAKE2B 75517032993f8192c4985d6bb5793b90c828565495a4471845e3efb6fa939268c7b94751baa6b85f5462cfb2a944ea4f4904a75b950a071c0840bb21313bb751 SHA512 31a8e4da410c1c02e96b3aa910fb3afe99c924af0f8299465e1c1b4b22e925aeb427b1ad349df459f93d2efd8bbf66804186f26486957d9e8196eda1b50eb5ba
+EBUILD uptimes-2.3-r2.ebuild 529 BLAKE2B 386946ca894ae58d415d36b198310e529f666fd78f93d5dfaf59ec171bd4c826c7858bbf0b1aa9481e15adf21535c79a46a3055122ead909aea69793a39c6094 SHA512 bf8e66286c792e86a7758c7b668ecd1d08ba6ec4725f2bba883cb037788af70414ccaa057fb3c0a5bda9e89a548f40f9b23e450e38c10130603e59567e5adbed
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/uptimes/files/50uptimes-gentoo.el b/app-emacs/uptimes/files/50uptimes-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/uptimes/files/50uptimes-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/uptimes/metadata.xml b/app-emacs/uptimes/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/uptimes/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/uptimes/uptimes-2.3-r2.ebuild b/app-emacs/uptimes/uptimes-2.3-r2.ebuild
new file mode 100644
index 000000000000..334cda759b40
--- /dev/null
+++ b/app-emacs/uptimes/uptimes-2.3-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+DESCRIPTION="Track and display emacs session uptimes"
+HOMEPAGE="http://www.davep.org/emacs/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="Uptimes is not enabled as a site default. Add the following
+ line to your ~/.emacs file to enable tracking of session uptimes:
+ \n(require 'uptimes)"
diff --git a/app-emacs/vhdl-mode-3.34.2 b/app-emacs/vhdl-mode-3.34.2
deleted file mode 100644
index da223bee079f..000000000000
--- a/app-emacs/vhdl-mode-3.34.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=VHDL-mode for Emacs
-EAPI=5
-HOMEPAGE=http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode-3.34.2.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=c341e8ba888c2a31a741ed512ea92973
diff --git a/app-emacs/vhdl-mode-3.35.1 b/app-emacs/vhdl-mode-3.35.1
deleted file mode 100644
index 9c5471970ae9..000000000000
--- a/app-emacs/vhdl-mode-3.35.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=VHDL-mode for Emacs
-EAPI=5
-HOMEPAGE=http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode-3.35.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=f9943ae7c250413f2b77bc5a3eff212a
diff --git a/app-emacs/vhdl-mode-3.38.1 b/app-emacs/vhdl-mode-3.38.1
deleted file mode 100644
index 26c985c9cc7f..000000000000
--- a/app-emacs/vhdl-mode-3.38.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=VHDL-mode for Emacs
-EAPI=5
-HOMEPAGE=http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode-3.38.1.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=62c3b163113cb5ecc9fe2848a0e99766
diff --git a/app-emacs/vhdl-mode/Manifest b/app-emacs/vhdl-mode/Manifest
new file mode 100644
index 000000000000..4520e95f4e04
--- /dev/null
+++ b/app-emacs/vhdl-mode/Manifest
@@ -0,0 +1,9 @@
+AUX 50vhdl-mode-gentoo.el 146 BLAKE2B 4a747d323606390205a52c3cebfd1e54b153e9e18ec3fa5ed557493df1579b783cd29fdef2a031f6b8f8c573fa3eb82e312c8e7449a5e91ffd00ebe9b4c874c1 SHA512 22f1d437f487fc2c0e739000687424271027c2defa87eec696c79ff5df958c6087475c7ff84c2af39e2eb756401ec1d4b1f013a27af1639c416843899333ee21
+AUX vhdl-mode-info-dir-gentoo.patch 522 BLAKE2B 35204f9ec727ec5ec44ecc03a99cedd5a5a3bc62e59dac577ed40dd0099cf08788b149e16d4fc0c2953dbe70bad8810eaed8496165e3b65ae1d8c23298a2aa5d SHA512 7ca2b0ea5c07255bf99e6a9105c120df924178a596e97d6a1bfcedfda4bcdf4f093f1383d1ea2a1383207c19971a110696ef9b49b17542e79d92c4501316039d
+DIST vhdl-mode-3.34.2.tar.gz 313856 BLAKE2B e4c685b0e9d616bc242e02d6ad17dec56feba580c11763d522f336c96b0ff09a740bf37ce5473437175e111d6b64b9b8e5612d70f9d2823a5e17b484ef54b0ec SHA512 38b3275fd4d92966bc806e16362bfea3d3ed8789330ba891fa0c149633d938abb1c8ea32085dd0b06a17fdd98a645121a5fe60a8c4c5fd3261d1f45d14ee4a6f
+DIST vhdl-mode-3.35.1.tar.gz 316090 BLAKE2B 5517c7881fc52df631d3efeb82e88d0b5db7038575eb378e241d062c4746d810ab308005b24570725ab244d1d3229b69896f8821944b15664561a38d828f4ae3 SHA512 963d4c8c938c9c9279a7ab862da6fc91257ab270e8eefb185d73b9c9217c4cc7b7330f2b33300bb7b604ed348543621d8371685e7e4a8f29d596e76ce8795f1c
+DIST vhdl-mode-3.38.1.tar.gz 318400 BLAKE2B 2ddad9f4e8fdb0fafd2e27075f5722fcf7959a2b50ad61c5860af52706d9579065e0880d7b9bd1b884c21cfc902760dff006404490c8cbb1474831aa4c6d841d SHA512 2cc12994e17658d65cffa348c59ac3208cc0f498731941b8f64da68e258ca57d6aa500d72103b005996cf3496e119cf59b52bbc1c4b740401685030b42f272a8
+EBUILD vhdl-mode-3.34.2.ebuild 533 BLAKE2B 668ea558451caae10a8daaffeed2f9d65d65946389202ce1508f773bbe6d73b4208eb98fef52e4c73fe9435c812745edd3b04aa371a5f8af4033e12addc48d5b SHA512 a2a7302687194f14cd855f441e3f2f31c015462a8c1547197711ae5b060fe185bc13ae05e02e8f0ad85ce1454b09f1260e6becc1a2e36cb8b1bd0716a12fbb3e
+EBUILD vhdl-mode-3.35.1.ebuild 530 BLAKE2B 2301997d33cf7a51789b8c66a15439cdb7a63c102cffb8cd48dc381d8f920863fed59a0b50e603516a8e9476d402e8ae09cc172779fe36d6f26e9462b1d47648 SHA512 1c1c7584288f7a3e9a666d4563347441da782deeddb49eed51a305beb21cb1aa6c062a0355ae8454130006532134b8bd0379928ec17fe2d7e035fb0f4da0f515
+EBUILD vhdl-mode-3.38.1.ebuild 533 BLAKE2B 88d38d63abb7ae205d808b248b5fa9656f41f1edf147f0fd797928616aa9901acf44e0365351e941689b11de76dc4d391a0490d738f5d108e877e0ee9239060d SHA512 47b31b47cd00c415f8ddc14814f1339a826e234999b0f36ea6ce170b9a8822c210320e07fa0e03acdbb69a3a0506b5089ad38e7bc40b96af2124edf93c836b6c
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/vhdl-mode/files/50vhdl-mode-gentoo.el b/app-emacs/vhdl-mode/files/50vhdl-mode-gentoo.el
new file mode 100644
index 000000000000..eaf968096ab9
--- /dev/null
+++ b/app-emacs/vhdl-mode/files/50vhdl-mode-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'vhdl-mode "vhdl-mode" "VHDL Mode" t)
+(add-to-list 'auto-mode-alist '("\\.vhdl?\\'" . vhdl-mode))
diff --git a/app-emacs/vhdl-mode/files/vhdl-mode-info-dir-gentoo.patch b/app-emacs/vhdl-mode/files/vhdl-mode-info-dir-gentoo.patch
new file mode 100644
index 000000000000..a8aa416a49b8
--- /dev/null
+++ b/app-emacs/vhdl-mode/files/vhdl-mode-info-dir-gentoo.patch
@@ -0,0 +1,14 @@
+--- vhdl-mode-3.33.21-orig/vhdl-mode.info 2007-08-10 12:07:23.000000000 +0200
++++ vhdl-mode-3.33.21/vhdl-mode.info 2007-09-23 17:37:09.000000000 +0200
+@@ -1,6 +1,11 @@
+ This is vhdl-mode.info, produced by makeinfo version 4.0 from
+ vhdl-mode.texi.
+
++INFO-DIR-SECTION Emacs
++START-INFO-DIR-ENTRY
++* VHDL Mode: (vhdl-mode). Emacs mode for editing VHDL files.
++END-INFO-DIR-ENTRY
++
+ Copyright (C) 1997 - 2002 Reto Zimmermann <reto@gnu.org> Copyright
+ (C) 1995 - 1997 Rodney J. Whitby <software.vhdl-mode@rwhitby.net>
+
diff --git a/app-emacs/vhdl-mode/metadata.xml b/app-emacs/vhdl-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/vhdl-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.34.2.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.34.2.ebuild
new file mode 100644
index 000000000000..781cee81001b
--- /dev/null
+++ b/app-emacs/vhdl-mode/vhdl-mode-3.34.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="VHDL-mode for Emacs"
+HOMEPAGE="http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
+SRC_URI="http://www.iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+ELISP_PATCHES="${PN}-info-dir-gentoo.patch"
+ELISP_REMOVE="site-start.*"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog README"
+
+src_install() {
+ elisp_src_install
+ doinfo vhdl-mode.info
+}
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.35.1.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.35.1.ebuild
new file mode 100644
index 000000000000..60a209731182
--- /dev/null
+++ b/app-emacs/vhdl-mode/vhdl-mode-3.35.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="VHDL-mode for Emacs"
+HOMEPAGE="http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
+SRC_URI="http://www.iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+ELISP_PATCHES="${PN}-info-dir-gentoo.patch"
+ELISP_REMOVE="site-start.*"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog README"
+
+src_install() {
+ elisp_src_install
+ doinfo vhdl-mode.info
+}
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.38.1.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.38.1.ebuild
new file mode 100644
index 000000000000..b998478a45d4
--- /dev/null
+++ b/app-emacs/vhdl-mode/vhdl-mode-3.38.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="VHDL-mode for Emacs"
+HOMEPAGE="http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
+SRC_URI="http://www.iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+ELISP_PATCHES="${PN}-info-dir-gentoo.patch"
+ELISP_REMOVE="site-start.*"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog README"
+
+src_install() {
+ elisp_src_install
+ doinfo vhdl-mode.info
+}
diff --git a/app-emacs/visual-basic-mode-1.4.12 b/app-emacs/visual-basic-mode-1.4.12
deleted file mode 100644
index 47e4aecff8db..000000000000
--- a/app-emacs/visual-basic-mode-1.4.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A mode for editing Visual Basic programs
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/VisualBasicMode
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/visual-basic-mode-1.4.12.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=0645a45d338aa208d72d3425f151710b
diff --git a/app-emacs/visual-basic-mode/Manifest b/app-emacs/visual-basic-mode/Manifest
new file mode 100644
index 000000000000..910c8e21b84a
--- /dev/null
+++ b/app-emacs/visual-basic-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50visual-basic-mode-gentoo.el 228 BLAKE2B 2f92aeab71b89c7d0c00e925dc8775e102a482f354988a7d2b3a99cc76fcc0ad9b9284fb198d81f0c31eabe50cc6ad5d2009177351465263a32e3522681a3335 SHA512 61a40524cfdd2045fb5fd4022fb5a9c85859741f0eb310c12066f7574243779633f2a436bc9cea4a32883f78e01f256d4da1d649d8910c06ea26b7ae9e2bcd81
+DIST visual-basic-mode-1.4.12.el.xz 16872 BLAKE2B 849a639dc54bf595541256424e26b6a157f2b75ab3c9fab8c6d7000d9abda6b9b979b51d06e81ff6a276353709aec5f4608e9806233560fcd4cdbdeff2e359f6 SHA512 ef8fdb883dbaa957d1d7526e0548611f755a7d3700a62d32790aafc0e25d97b3f6784969b584dcdda39da681b4e59253daff217bde5a783b923257e77e9549ca
+EBUILD visual-basic-mode-1.4.12.ebuild 435 BLAKE2B 3f5a036a44bf019d60213aba79f1e0d69f8360369ce3d3a2f1f58f74f37f11405a50215c040427507f868140d1cedede666eb267b9e98bb71e5d7a173d8f3a5c SHA512 74b142d4f789d30dc0111e01e27dc7221eaf082c9079d1c83be90ac3267e6fde8d194b4da9e54140751a6e32d117feee4a34cc38c839493f95fd912a96c71d94
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/visual-basic-mode/files/50visual-basic-mode-gentoo.el b/app-emacs/visual-basic-mode/files/50visual-basic-mode-gentoo.el
new file mode 100644
index 000000000000..ab6b2bd4927f
--- /dev/null
+++ b/app-emacs/visual-basic-mode/files/50visual-basic-mode-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'visual-basic-mode "visual-basic-mode"
+ "A mode for editing Visual Basic programs" t)
+(add-to-list 'auto-mode-alist
+ '("\\.\\(vbs?\\|class\\.asp\\)\\'" . visual-basic-mode))
diff --git a/app-emacs/visual-basic-mode/metadata.xml b/app-emacs/visual-basic-mode/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/visual-basic-mode/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild b/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild
new file mode 100644
index 000000000000..44361f052a39
--- /dev/null
+++ b/app-emacs/visual-basic-mode/visual-basic-mode-1.4.12.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A mode for editing Visual Basic programs"
+HOMEPAGE="https://www.emacswiki.org/emacs/VisualBasicMode"
+# taken from http://www.emacswiki.org/emacs/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/vm-8.1.2 b/app-emacs/vm-8.1.2
deleted file mode 100644
index f85c4ad27c96..000000000000
--- a/app-emacs/vm-8.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=bbdb? ( app-emacs/bbdb ) >=virtual/emacs-23
-DESCRIPTION=The VM mail reader for Emacs
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/viewmail/
-IUSE=bbdb ssl
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2+
-RDEPEND=!app-emacs/u-vm-color bbdb? ( app-emacs/bbdb ) ssl? ( net-misc/stunnel ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://launchpad.net/vm/8.1.x/8.1.2/+download/vm-8.1.2.tgz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=db9380550dd2e066b0b95c55431a4875
diff --git a/app-emacs/vm-8.2.0_beta b/app-emacs/vm-8.2.0_beta
deleted file mode 100644
index 1e03fe9b31e0..000000000000
--- a/app-emacs/vm-8.2.0_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=bbdb? ( app-emacs/bbdb ) sys-apps/texinfo >=virtual/emacs-23
-DESCRIPTION=The VM mail reader for Emacs
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/viewmail/
-IUSE=bbdb ssl
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2+
-RDEPEND=!app-emacs/u-vm-color bbdb? ( app-emacs/bbdb ) ssl? ( net-misc/stunnel ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://launchpad.net/vm/8.2.x/8.2.0b/+download/vm-8.2.0b.tgz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ae5eef45a17d48b5010526e10cf9bb54
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
new file mode 100644
index 000000000000..70bfcb4cbfb6
--- /dev/null
+++ b/app-emacs/vm/Manifest
@@ -0,0 +1,11 @@
+AUX 50vm-gentoo-8.0.el 147 BLAKE2B 3f4da8804a26a4b931aa52409062cd9de6e4b16941e64a139216b2afcb27d09447ea3e8d4ee03ed35931f2163d1932c66b5a247ee2dee60868ba2472572e112d SHA512 9573b5ff6b747c8ac8a8d41c52391c320fe93d9e3a2aa8c22bfe5b4ea2e703fdd1cf18c59ec22aebc8fbedbc324561945bdd3407ebde432edb0015af7ad2c4e1
+AUX 50vm-gentoo.el 62 BLAKE2B 2e5093b9d4244ac229fa63fd62b7bacdf3902ea0f33616adb94852424d2078c11743f4ebd9d080e0aeaa628f66a2de38ed40dc00d6ec9023902a0670468fcb71 SHA512 e58660519b0f7e6d4f608ef09d0861293133ce25e7799e163a1afdf62193f73f0c29a081b4eb26d808a54168ab6f5f6083a107dec7228bf054357bbf16bc90c7
+AUX vm-8.0-no-pcrisis.patch 620 BLAKE2B eb8615854424645a673a62da4c9546e8ac42679d0fb74a14cc54b38006865c3e8c59fd84fb8f0d3a7b7a216cda84403836b6b759340c397de942291f8f17e042 SHA512 57e0ca67484db7a517f1e45cd7ef6974a0938c1ebb9ea740cab36ee328b1b99ce152c14701109862d89918445efc918ab1f7dacfd9228f6466f40177f38f1ae2
+AUX vm-8.1.2-texinfo-5.patch 2608 BLAKE2B 1cbfe5cfd5d633f577a3767c930d2a78e5ea29b7f880529b10e6017e1e16463be89a6c47b2d5fac70d3417b3badb390e5dd6eda0928720bc1e498586a4994ffa SHA512 cfb55e3ec2311fc1b5ca5268e8ee07ad2ea8a276804c9e891727b90fab6aec0b0f7bad274b65bb692fc7391bb95892ca1f87092594ba48716621925b82347bc9
+AUX vm-8.2.0_beta-datadir.patch 1177 BLAKE2B bb0379126f4521ba8c75e1c7fe0d3c7e179333c10acb915ce8cc9e034202d17ebd89855d0ec7b682f174d27022ace06deb545df5a73130b380aa83797b4732ed SHA512 2097837ee4d7fe28356102452f4b110d358624b607c440aee654edcaf577b3e1319bac0eb0a44c2ecefb64334e28a08731c512116bcedd4c8930ba2cee1d48c3
+AUX vm-8.2.0_beta-texinfo-5.patch 8594 BLAKE2B 542c755aa7aee4f39c8977ec0a33eab53954bdecfc9e9b65a5fa069c3f3fa89311a00356a8dfdebc2159bfd5a047dbb3500b78e0f1f21398e41fe1ac55516aba SHA512 dbc8f9456735f4d1757a7094bf2cde86148444bf4c46136eb5170b94e9124bee48c08d8f7d82e3b3c03ebd3443f0ec3dc988178e335189904c3d2b4edb6d2cd3
+DIST vm-8.1.2.tgz 703527 BLAKE2B 34b6326363893b830d76a48dc6e103100d8da6891392926d21eff00bb25217af58eb6f161ba38e99becc31f6bf1496eb75fb71709b57b08cd247fa1b28543a1b SHA512 6b879e237d6509ecd95aff3fb5e26018cb38dd19b29a57545bd28b0ca45961a7106cefd6fdd42e123119ac465a4b9ef66b683c47a9f1d9ac683a954b484a0ff4
+DIST vm-8.2.0b.tgz 839789 BLAKE2B fc032e0a6259d2397d80cc80fbb7cf5845e43a228124f867402738a9123c78c798822d8d9c8edbdb823bfe3bce946d53afb6cd24e02d28925a51d458cf21eedf SHA512 37b642975e8fe7e350c0a648f83608b28d8616417d376d9888c89b37c90d8bdb3c91cdc4c91a0f5072d29ac81bfea3d88f9b36699379bf8a5bdd15dd5a70858d
+EBUILD vm-8.1.2.ebuild 1112 BLAKE2B 978e66b2ed8cb96d8ea78afc5724359edd1d5d0137386d8e8cb55f58c974f4f8e5d758176bd1f8722fcbb4df08455058476658e619635271ea72e6265881d1ee SHA512 2679c307a2aed43826913b48b3e4055f6fb4ae0c1effec8180376ac8ae037d15a184982fde37142fe86fd0778478bdb45cdc5ed4e6e3aa5e53c4e92c58662339
+EBUILD vm-8.2.0_beta.ebuild 1525 BLAKE2B ea6c47fd0ced16fb92f463937afc33848e7d94aec80e89b3a8ea7661cc2820349983285c3360e940f21f399219d5ca9d9379c840d0fb6c042bc5da6bf59d3ef1 SHA512 24dbebe03a041153d07bd89b2ea0a97a535e165e359d3123a0144e1989f2b43baea1cca840ced61d1c2710d73db124c9673893b7d8cdebbb2838bef3cd2e13e5
+MISC metadata.xml 785 BLAKE2B 1d8be69c7be90cb03815bad0324c55e4ed4be6443246922054dc6ebf4b66090bb9f7f30916cb5df07a664d151a77de6591a45d923847547898ebc32ac9505038 SHA512 62df38ecfe4b3de679d856cbca5b58d73c73a885f86998f00aa75e67efc2def4ce973bc1e2f40fa22f6f79cc9f4fc4185a916e6ba176a89d685b1092ea9eddfe
diff --git a/app-emacs/vm/files/50vm-gentoo-8.0.el b/app-emacs/vm/files/50vm-gentoo-8.0.el
new file mode 100644
index 000000000000..554b6634a2ee
--- /dev/null
+++ b/app-emacs/vm/files/50vm-gentoo-8.0.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(setq vm-toolbar-pixmap-directory "@SITEETC@")
+(setq vm-image-directory "@SITEETC@")
+(require 'vm-autoloads)
diff --git a/app-emacs/vm/files/50vm-gentoo.el b/app-emacs/vm/files/50vm-gentoo.el
new file mode 100644
index 000000000000..d823436d3bd2
--- /dev/null
+++ b/app-emacs/vm/files/50vm-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'vm-autoloads)
diff --git a/app-emacs/vm/files/vm-8.0-no-pcrisis.patch b/app-emacs/vm/files/vm-8.0-no-pcrisis.patch
new file mode 100644
index 000000000000..33b1a1a9679e
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.0-no-pcrisis.patch
@@ -0,0 +1,21 @@
+--- vm-8.0.1-465-orig/info/Makefile.in 2007-06-29 00:35:41.000000000 +0200
++++ vm-8.0.1-465/info/Makefile.in 2007-07-13 20:07:38.000000000 +0200
+@@ -35,7 +35,7 @@
+
+ all: info
+
+-info: vm.info vm-pcrisis.info
++info: vm.info
+
+ Makefile: @srcdir@/Makefile.in
+ cd @srcdir@/..; ./config.status
+--- vm-8.0.1-465-orig/lisp/Makefile.in 2007-06-29 00:35:41.000000000 +0200
++++ vm-8.0.1-465/lisp/Makefile.in 2007-07-13 20:08:00.000000000 +0200
+@@ -30,7 +30,6 @@
+ SOURCES += vm-motion.el
+ SOURCES += vm-mouse.el
+ SOURCES += vm-page.el
+-SOURCES += vm-pcrisis.el
+ SOURCES += vm-pgg.el
+ SOURCES += vm-pine.el
+ SOURCES += vm-pop.el
diff --git a/app-emacs/vm/files/vm-8.1.2-texinfo-5.patch b/app-emacs/vm/files/vm-8.1.2-texinfo-5.patch
new file mode 100644
index 000000000000..0283e19a8a73
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.1.2-texinfo-5.patch
@@ -0,0 +1,59 @@
+diff -up emacs-vm-8.1.2/info/vm.texinfo.texinfo5 emacs-vm-8.1.2/info/vm.texinfo
+--- emacs-vm-8.1.2/info/vm.texinfo.texinfo5 2012-03-05 18:43:21.000000000 +0100
++++ emacs-vm-8.1.2/info/vm.texinfo 2013-05-19 00:05:10.000000000 +0200
+@@ -783,7 +783,8 @@ following formats:
+
+ @example
+ ``pop:@var{HOST}:@var{PORT}:@var{AUTH}:@var{USER}:@var{PASSWORD}''
+-``imap:@var{HOST}:@var{PORT}:@var{MAILBOX}:@var{AUTH}:@var{USER}:@var{PASSWORD}''@end example
++``imap:@var{HOST}:@var{PORT}:@var{MAILBOX}:@var{AUTH}:@var{USER}:@var{PASSWORD}''
++@end example
+
+ @noindent Remote mailboxes accessed by VM in this fashion are referred
+ to as @dfn{server folders} (and @dfn{POP folders} or @dfn{IMAP
+@@ -996,8 +997,7 @@ The variable's value should be an associ
+ ((@var{IMAPDROP} @var{NAME}) ...)
+ @end example
+
+-@var{IMAPDROP} is an IMAP maildrop specification (@ref{maildrop
+- specification}).
++@var{IMAPDROP} is an IMAP maildrop specification (@ref{maildrop specification}).
+
+ @var{NAME} is a string that should give a less cumbersome name that you
+ will use to refer to this maildrop when using @code{vm-visit-imap-folder}.
+@@ -2342,7 +2342,7 @@ MIME encode it as necessary.
+ * MIME preview:: Previewing a MIME message before sending.
+ @end menu
+
+-@node MIME attachments, MIME characters, MIME Composition, MIME Composition,
++@node MIME attachments, MIME characters, MIME Composition, MIME Composition
+ @unnumberedsec MIME attachments
+
+ @kindex C-c C-a
+@@ -3328,13 +3328,15 @@ The fifth is `f' or ` ', for messages fi
+ The sixth is `w' or ` ', for messages written.
+ @*
+ The seventh is `e' or ` ', for messages that have been edited.
++@vindex vm-summary-attachment-indicator
+ @item P
+ indicator for a message with attachments.
+-The variable @vindex vm-summary-attachment-indicator
++The variable
+ @code{vm-summary-attachment-indicator} is the inserted string, by default a @code{$}.
++@vindex vm-summary-postponed-indicator
+ @item p
+ indicator for a postponed message.
+-The variable @vindex vm-summary-postponed-indicator
++The variable
+ @code{vm-summary-postponed-indicator} is the inserted string, by default a @code{P}.
+ @item c
+ number of characters in message (ignoring headers)
+@@ -4588,7 +4590,7 @@ The project code base is maintained at t
+ @uref{http://launchpad.net/vm}. The ``VM Development Team'' can be
+ reached here using the email address @code{vm@@launchpad.net}.
+
+-@unnumberedsubsec Savannah project site
++@unnumberedsec Savannah project site
+
+ The changes made in each of the releases is described in the @samp{NEWS}
+ file, which can be found in the source code repository. The changes made
diff --git a/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch b/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch
new file mode 100644
index 000000000000..86608e77c97a
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.2.0_beta-datadir.patch
@@ -0,0 +1,31 @@
+--- vm-8.2.0b-orig/lisp/Makefile.in
++++ vm-8.2.0b/lisp/Makefile.in
+@@ -96,7 +96,10 @@
+ datadir= @datadir@
+ datarootdir= @datarootdir@
+ lispdir = @lispdir@
++etcdir= @etcdir@
+ pixmapdir= @pixmapdir@
++docdir = @docdir@
++infodir = @infodir@
+
+ EMACS_PROG = @EMACS_PROG@
+ EMACS_FLAVOR = @EMACS_FLAVOR@
+@@ -137,7 +140,7 @@
+ "$(EMACS_PROG)" $(FLAGS) -l autoload \
+ -f vm-built-autoloads "@abs_builddir@/$@" "`pwd`")
+ echo "(custom-add-load 'vm 'vm-cus-load)" | tr -d '\015' >> $@
+- echo "(setq vm-configure-datadir \"${datadir}/vm\")" | tr -d '\015' >> $@
++ echo "(setq vm-configure-datadir \"${etcdir}\")" | tr -d '\015' >> $@
+ echo "(setq vm-configure-pixmapdir \"${pixmapdir}\")" | tr -d '\015' >> $@
+ echo "(setq vm-configure-docdir \"${docdir}\")" | tr -d '\015' >> $@
+ echo "(setq vm-configure-infodir \"${infodir}\")" | tr -d '\015' >> $@
+@@ -168,7 +171,7 @@
+ cat $@.tmp >> $@
+ echo "(setq features (delete 'vm-autoloads features))" >> $@
+ echo "(require 'vm-vars)" >> $@
+- echo "(setq vm-configure-datadir \"${datadir}\")" >> $@
++ echo "(setq vm-configure-datadir \"${etcdir}\")" >> $@
+ echo "(setq vm-configure-pixmapdir \"${pixmapdir}\")" >> $@
+ $(RM) $@.tmp
+
diff --git a/app-emacs/vm/files/vm-8.2.0_beta-texinfo-5.patch b/app-emacs/vm/files/vm-8.2.0_beta-texinfo-5.patch
new file mode 100644
index 000000000000..92ea4b0df578
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.2.0_beta-texinfo-5.patch
@@ -0,0 +1,250 @@
+--- vm-8.2.0b-orig/info/vm.texinfo
++++ vm-8.2.0b/info/vm.texinfo
+@@ -914,7 +914,8 @@
+
+ @example
+ ``pop:@var{HOST}:@var{PORT}:@var{AUTH}:@var{USER}:@var{PASSWORD}''
+-``imap:@var{HOST}:@var{PORT}:@var{MAILBOX}:@var{AUTH}:@var{USER}:@var{PASSWORD}''@end example
++``imap:@var{HOST}:@var{PORT}:@var{MAILBOX}:@var{AUTH}:@var{USER}:@var{PASSWORD}''
++@end example
+
+ @noindent Remote mailboxes accessed by VM in this fashion are referred
+ to as @dfn{server folders} (and @dfn{@acronym{POP} folders} or @dfn{@acronym{IMAP}
+@@ -1207,8 +1208,8 @@
+ ((@var{IMAPDROP} @var{NAME}) ...)
+ @end example
+
+-@var{IMAPDROP} is an @acronym{IMAP} maildrop specification (@ref{maildrop
+- specification}).
++@var{IMAPDROP} is an @acronym{IMAP} maildrop specification
++(@ref{maildrop specification}).
+
+ @var{NAME} is a string that should give a less cumbersome name that you
+ will use to refer to this maildrop when using @code{vm-visit-imap-folder}.
+@@ -2814,7 +2815,7 @@
+ * @acronym{MIME} preview:: Previewing a @acronym{MIME} message before sending.
+ @end menu
+
+-@node @acronym{MIME} attachments, @acronym{MIME} characters, Sending @acronym{MIME} Messages, Sending @acronym{MIME} Messages,
++@node @acronym{MIME} attachments, @acronym{MIME} characters, Sending @acronym{MIME} Messages, Sending @acronym{MIME} Messages
+ @unnumberedsec @acronym{MIME} attachments
+
+ @kindex C-c C-a
+@@ -2868,7 +2869,7 @@
+ before invoking this command. All the marked messages will be
+ attached as a digest in the outgoing message.
+
+-@unnumberedsubsubsec Point-to-point attachment operations
++@unnumberedsubsec Point-to-point attachment operations
+
+ @cindex point-to-point attachment operations
+ A number of @dfn{point-to-point operations} allow you to attach objects
+@@ -3425,7 +3426,7 @@
+ works like @code{vm-delete-after-saving} but applies to the @kbd{A}
+ (@code{vm-auto-archive-messages}) command (see below).
+
+-@unnumberedsubsec vm-auto-folder-alist
++@unnumberedsec vm-auto-folder-alist
+
+ @vindex vm-auto-folder-alist
+ The variable @code{vm-auto-folder-alist} is used to specify
+@@ -3477,7 +3478,7 @@
+ always case-insensitive because the Internet message standard RFC 822
+ specifies that header names are case indistinct.
+
+-@unnumberedsubsec Other commands
++@unnumberedsec Other commands
+
+ @table @kbd
+ @findex vm-save-message-sans-headers
+@@ -5174,7 +5175,7 @@
+ been expunged in the cache folder are expunged on the server.
+
+ @anchor{@acronym{UIDVALIDITY}}
+-@unnumberedsubsec @acronym{UIDVALIDITY}
++@unnumberedsec @acronym{UIDVALIDITY}
+
+ @cindex @acronym{UIDVALIDITY}
+ Messages on an @acronym{IMAP} server have unique id numbers called UID's.
+@@ -5198,7 +5199,7 @@
+ setting the @code{vm-enable-external-messages} flag to @code{(imap)} before
+ you refresh the cache so that it will be quicker. @pxref{External Messages}.
+
+-@unnumberedsubsec Operations for the IMAP server
++@unnumberedsec Operations for the IMAP server
+
+ @cindex vm-list-imap-folders
+ The command @code{vm-list-imap-folders} lists the folders available on the
+@@ -6021,7 +6022,7 @@
+ Useful ways to customize VM.
+ @section Reading messages
+
+-@unnumberedsubsubsec Shrunken headers
++@unnumberedsubsec Shrunken headers
+
+ @cindex headers, shrunken
+ @vindex vm-enable-addons
+@@ -6045,7 +6046,7 @@
+
+ (This add-on was provided by Robert Fenk.)
+
+-@unnumberedsubsubsec @acronym{MIME} alternatives
++@unnumberedsubsec @acronym{MIME} alternatives
+ @cindex @acronym{MIME} alternatives
+ The default setting of VM for handling @acronym{MIME} alternatives is
+ @code{best-internal}, which means the best alternative that can be
+@@ -6069,7 +6070,7 @@
+
+ @section Saving messages and attachments
+
+-@unnumberedsubsubsec Auto saving attachments
++@unnumberedsubsec Auto saving attachments
+
+ Messages with attachments get bulky and increase the size of VM
+ folders, slowing down VM. The functions
+@@ -6179,7 +6180,7 @@
+ @uref{http://launchpad.net/vm}. The ``VM Development Team'' can be
+ reached here using the email address @email{vm@@lists.launchpad.net}.
+
+-@unnumberedsubsec Savannah project site
++@unnumberedsec Savannah project site
+
+ The changes made in each of the releases is described in the @samp{NEWS}
+ file, which can be found in the source code repository. The changes made
+@@ -6197,7 +6198,7 @@
+ takes you to a page that lists various version of VM source code, and
+ gives instructions for downloading it via @samp{Bazaar} (@code{bzr}).
+
+-@unnumberedsubsec Technical support
++@unnumberedsec Technical support
+
+ VM has a dedicated usenet newsgroup @code{gnu.emacs.vm.info} and a
+ gmane newsgroup @code{gmane.emacs.viewmail}, in which the developers
+@@ -6220,7 +6221,7 @@
+
+ The best way to report bugs is via the Launchpad bug tacker. See below.
+
+-@unnumberedsubsec Get Involved
++@unnumberedsec Get Involved
+
+ VM is now supported and maintained by the user community. So, as an
+ active user, your participation is key to keep the project going.
+@@ -6249,7 +6250,7 @@
+ and merge your branch with the main development when your changes
+ are ready.
+
+-@unnumberedsubsec Contributors
++@unnumberedsec Contributors
+
+ Contributions to the code from the following members of the VM community
+ are gratefully acknowledged:
+@@ -6276,7 +6277,7 @@
+
+ Please let us know if any other contributors have been missed out.
+
+-@unnumberedsubsec Selected Releases of Kyle Jones
++@unnumberedsec Selected Releases of Kyle Jones
+ @itemize
+ @item Version 4.10, released in 1989.
+ @item Version 5.00, released in 1990.
+@@ -6291,7 +6292,7 @@
+ @end itemize
+
+
+-@unnumberedsubsec Releases of Robert Widhopf-Fenk
++@unnumberedsec Releases of Robert Widhopf-Fenk
+ @itemize
+ @item Version 8.0.0, released 31 May, 2007.
+ @item Version 8.0.1, released 29 June, 2007.
+@@ -6311,7 +6312,7 @@
+ @end itemize
+
+
+-@unnumberedsubsec Releases of VM development team
++@unnumberedsec Releases of VM development team
+ @itemize
+ @item Version 8.1.0, released 21 March, 2010.
+ @item Version 8.1.1, released 25 April, 2010.
+@@ -6545,7 +6546,7 @@
+ @acronym{IMAP} folders.)
+ @end itemize
+
+-@unnumberedsubsubsec Folder variables
++@unnumberedsubsec Folder variables
+
+ Internal to Emacs, VM stores the folder as simply a text buffer. However, it
+ remembers a variety of data about the message contents in the buffer
+@@ -6712,7 +6713,7 @@
+ undoing cycle.
+ @end itemize
+
+-@unnumberedsubsubsec vm-folder-access-data
++@unnumberedsubsec vm-folder-access-data
+
+ The variable @code{vm-folder-access-data} is a vector storing data about the
+ state of the mail server (for @acronym{POP} and @acronym{IMAP} servers). It contains the
+--- vm-8.2.0b-orig/info/vm-pcrisis.texinfo
++++ vm-8.2.0b/info/vm-pcrisis.texinfo
+@@ -1179,7 +1179,7 @@
+
+ @c ***************************************************************************
+
+-@unnumberedsubsec vmpc-auto-profiles-file
++@unnumberedsec vmpc-auto-profiles-file
+ @vindex vmpc-auto-profiles-file
+
+ The variable @code{vmpc-auto-profiles-file} contains the name of the
+@@ -1191,7 +1191,7 @@
+
+ @c ***************************************************************************
+
+-@unnumberedsubsec vmpc-auto-profiles-expunge-days
++@unnumberedsec vmpc-auto-profiles-expunge-days
+ @vindex vmpc-auto-profiles-expunge-days
+
+ In order to keep vmpc-auto-profiles-file from becoming massive,
+@@ -1203,7 +1203,7 @@
+
+ @c ***************************************************************************
+
+-@unnumberedsubsec vmpc-sig-face
++@unnumberedsec vmpc-sig-face
+ @vindex vmpc-sig-face
+
+ This is the face used to highlight the signature. You can use
+@@ -1212,7 +1212,7 @@
+
+ @c ***************************************************************************
+
+-@unnumberedsubsec vmpc-pre-sig-face
++@unnumberedsec vmpc-pre-sig-face
+ @vindex vmpc-pre-sig-face
+
+ This is the face used to highlight the pre-signature. You can use
+@@ -1221,7 +1221,7 @@
+
+ @c ***************************************************************************
+
+-@unnumberedsubsec vmpc-intangible-sig
++@unnumberedsec vmpc-intangible-sig
+ @vindex vmpc-intangible-sig
+ @anchor{vmpc-intangible-sig}
+
+@@ -1240,7 +1240,7 @@
+
+ @c ***************************************************************************
+
+-@unnumberedsubsec vmpc-intangible-pre-sig
++@unnumberedsec vmpc-intangible-pre-sig
+ @vindex vmpc-intangible-pre-sig
+
+ The @code{vmpc-intangible-pre-sig} variable works just like
+@@ -1249,7 +1249,7 @@
+
+ @c ***************************************************************************
+
+-@unnumberedsubsec vmpc-expect-default-signature
++@unnumberedsec vmpc-expect-default-signature
+ @vindex vmpc-expect-default-signature
+
+ Traditionally, signatures are added to new mail messages using a
diff --git a/app-emacs/vm/metadata.xml b/app-emacs/vm/metadata.xml
new file mode 100644
index 000000000000..3fd3c5b75b23
--- /dev/null
+++ b/app-emacs/vm/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ VM is a mail reader that runs inside GNU Emacs and XEmacs. It was written as
+ an alternative to the Emacs RMAIL mail reader. VM is highly configurable and
+ easy to use. It supports POP and IMAP for mail retrieval, understands MIME,
+ and reads both the standard UNIX mailbox format and the BABYL format used by
+ the RMAIL mailer.
+</longdescription>
+<use>
+ <flag name="bbdb">Include support for <pkg>app-emacs/bbdb</pkg></flag>
+</use>
+<upstream>
+ <remote-id type="launchpad">vm</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/vm/vm-8.1.2.ebuild b/app-emacs/vm/vm-8.1.2.ebuild
new file mode 100644
index 000000000000..3cc65011f9ca
--- /dev/null
+++ b/app-emacs/vm/vm-8.1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp eutils
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="The VM mail reader for Emacs"
+HOMEPAGE="http://www.nongnu.org/viewmail/"
+SRC_URI="https://launchpad.net/vm/${PV%.*}.x/${MY_PV}/+download/${MY_P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="bbdb ssl"
+
+DEPEND="bbdb? ( app-emacs/bbdb )"
+RDEPEND="!app-emacs/u-vm-color
+ ${DEPEND}
+ ssl? ( net-misc/stunnel )"
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50${PN}-gentoo-8.0.el"
+
+src_prepare() {
+ if ! use bbdb; then
+ elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
+ epatch "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
+ fi
+ epatch "${FILESDIR}/${P}-texinfo-5.patch"
+}
+
+src_configure() {
+ econf \
+ --with-emacs="emacs" \
+ --with-pixmapdir="${SITEETC}/${PN}" \
+ $(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc CHANGES NEWS README TODO example.vm
+}
diff --git a/app-emacs/vm/vm-8.2.0_beta.ebuild b/app-emacs/vm/vm-8.2.0_beta.ebuild
new file mode 100644
index 000000000000..7a2006d18d99
--- /dev/null
+++ b/app-emacs/vm/vm-8.2.0_beta.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp eutils
+
+MY_PV="${PV/_beta/b}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="The VM mail reader for Emacs"
+HOMEPAGE="http://www.nongnu.org/viewmail/"
+SRC_URI="https://launchpad.net/vm/${PV%.*}.x/${MY_PV}/+download/${MY_P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="bbdb ssl"
+
+DEPEND="bbdb? ( app-emacs/bbdb )"
+RDEPEND="!app-emacs/u-vm-color
+ ${DEPEND}
+ ssl? ( net-misc/stunnel )"
+DEPEND="${DEPEND}
+ sys-apps/texinfo"
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-datadir.patch"
+ epatch "${FILESDIR}/${P}-texinfo-5.patch"
+
+ if ! use bbdb; then
+ elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
+ epatch "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
+ fi
+}
+
+src_configure() {
+ econf \
+ --with-emacs="emacs" \
+ --with-lispdir="${SITELISP}/${PN}" \
+ --with-etcdir="${SITEETC}/${PN}" \
+ --with-docdir="/usr/share/doc/${PF}" \
+ $(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ # delete duplicate documentation
+ find "${D}/${SITEETC}/${PN}" -type d -name pixmaps -prune \
+ -o -type f -exec rm '{}' '+' || die
+ rm "${D}/usr/share/doc/${PF}/COPYING" || die
+
+ dodoc example.vm
+ # NEWS is accessed from lisp and must not be compressed
+ docompress -x /usr/share/doc/${PF}/NEWS
+}
diff --git a/app-emacs/volume-1.0-r1 b/app-emacs/volume-1.0-r1
deleted file mode 100644
index c8ba2b4e282c..000000000000
--- a/app-emacs/volume-1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Tweak your sound card volume from Emacs
-EAPI=5
-HOMEPAGE=https://github.com/dbrock/volume-el
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/volume-1.0.el.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=0f855b888df369f97e1284f12ab69058
diff --git a/app-emacs/volume/Manifest b/app-emacs/volume/Manifest
new file mode 100644
index 000000000000..3fb3379f5c5d
--- /dev/null
+++ b/app-emacs/volume/Manifest
@@ -0,0 +1,5 @@
+AUX 50volume-gentoo.el 100 BLAKE2B 03917eb50fa454861498a47516054b0a58bbfff701cbc7665597380ec2f76a7f8600b4916e15d9cc5a841168da4db9b26b9e122cc65771437e444d1d14bdcfdd SHA512 82727310458923bdb06d840b3471c49f6498faaab53033333d1ba02ab2c03f709e17ea5373d264441401e0bb82770c9c451e61cd468fa04a04229471f620ca63
+AUX volume-1.0-mode-line.patch 552 BLAKE2B 48a7159d7389bd7d4a87280af1eceb4e32b1f3ea467176ecb0e1f787364930d91eb7cf56da124b6483f6db0a53ffb016c5987b4f73437701f815ddb448f103db SHA512 aec6fa297e242ce601704ca5709d9595ea0fb14fab2d0eeb3380d20d545a7131e5260dc1c2cc7e1d85c88789aa7f4d2f4701c121dec1401a3e4b7902b40c589d
+DIST volume-1.0.el.bz2 8044 BLAKE2B cdd914a25c137f28f9f26e88430ed6ce3be7b4788c9fcaa3e0246b7057233c78af80f33ce9b6fd778fac47c9de624707f169f6e2836b93aa2c30f8c25e88deef SHA512 32672ef525571bc022d6c0f5f5f5f9d16bb5f57176e63a3dbaa67f41cef5a8bfef06468093c439601b2b3439f6e77e8e7e6d6c9245b18a77ebb409c64eece510
+EBUILD volume-1.0-r1.ebuild 607 BLAKE2B 2306f3b3aea9147d64450ec40be60fb24897251f41b9031d8b58b90e746122ff3bec12b95ea7ae88bb1d79af027d99d2ed1638378603ad7bfa0a2b5210098842 SHA512 5c38f49a9a862262d91e5161485f8cc528fe6eae383704e349a8e7df4767b0235ce61f73beff2a549152675691a9be0c360e37d26806ba44f09559182575b88a
+MISC metadata.xml 361 BLAKE2B 65088775308be6f87f238dcb08c1317b78622df1f05f19ea70bf9fd19d29f9fe59ea3170d2705edb0d40030680a7ac6a3c45926457e3b2556ead54bca96e31ba SHA512 1f95cd26b08c5403a010ffe5836551fc556ad80f4ec4983dea1c52c526f574085f0d4c85e3ef6d78253464418b7aea0ad51a303555b70252914c4162ce504550
diff --git a/app-emacs/volume/files/50volume-gentoo.el b/app-emacs/volume/files/50volume-gentoo.el
new file mode 100644
index 000000000000..2ab5a2bb5e04
--- /dev/null
+++ b/app-emacs/volume/files/50volume-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'volume "volume" "Tweak your sound card volume." t)
diff --git a/app-emacs/volume/files/volume-1.0-mode-line.patch b/app-emacs/volume/files/volume-1.0-mode-line.patch
new file mode 100644
index 000000000000..2b3e4ccd33ef
--- /dev/null
+++ b/app-emacs/volume/files/volume-1.0-mode-line.patch
@@ -0,0 +1,14 @@
+Use `mode-line' instead of `modeline' for Emacs 24 compat.
+Patch taken from upstream repo.
+
+--- a/volume.el
++++ b/volume.el
+@@ -973,7 +973,7 @@
+ (select-window
+ (split-window-vertically
+ (if (and (fboundp 'face-attr-construct)
+- (plist-get (face-attr-construct 'modeline) :box))
++ (plist-get (face-attr-construct 'mode-line) :box))
+ -3 -2)))
+ (switch-to-buffer volume-buffer)))
+ ((not (eq (current-buffer) volume-buffer))
diff --git a/app-emacs/volume/metadata.xml b/app-emacs/volume/metadata.xml
new file mode 100644
index 000000000000..2382f740dc4e
--- /dev/null
+++ b/app-emacs/volume/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">dbrock/volume-el</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/volume/volume-1.0-r1.ebuild b/app-emacs/volume/volume-1.0-r1.ebuild
new file mode 100644
index 000000000000..6837cd3caa22
--- /dev/null
+++ b/app-emacs/volume/volume-1.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Tweak your sound card volume from Emacs"
+HOMEPAGE="https://github.com/dbrock/volume-el"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+
+# NOTE we might define the following which volume.el can work with by
+# default, but volume.el can really work with anything.
+
+# RDEPEND="|| ( media-sound/aumixer media-sound/alsa-utils )"
+
+ELISP_PATCHES="${P}-mode-line.patch"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/w3mnav-0.5-r3 b/app-emacs/w3mnav-0.5-r3
deleted file mode 100644
index 39a14d7893be..000000000000
--- a/app-emacs/w3mnav-0.5-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/emacs-w3m >=virtual/emacs-23
-DESCRIPTION=Add Info-like navigation keys to the emacs-w3m web browser
-EAPI=5
-HOMEPAGE=http://www.neilvandyke.org/w3mnav/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2+
-RDEPEND=app-emacs/emacs-w3m >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/w3mnav-0.5.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=336c697e2cbbeba2bbc165d2f5a0d46d
diff --git a/app-emacs/w3mnav/Manifest b/app-emacs/w3mnav/Manifest
new file mode 100644
index 000000000000..9deb092748a4
--- /dev/null
+++ b/app-emacs/w3mnav/Manifest
@@ -0,0 +1,4 @@
+AUX 75w3mnav-gentoo.el 407 BLAKE2B 8b0f4f6ce133ef18a8d70f7b48881b29f67fefe58be4ab19316ed6ab23d9cba2e6193d43b47ae22c17c2abd4a182c034f70bc99b0aad904c5be7ba95b6ac07b2 SHA512 03126595d1321f3716593c0db621b0b7e1297a2cf64e980eb74b002f4351a341ac9aa32db5d5badc3a5c803899b0b33ae4d4bda4ba675f88aa45e87ff5a803da
+DIST w3mnav-0.5.tar.gz 2378 BLAKE2B 548953415020f08b83f07447c09a7facd5e6ccc5aeb36cdda3718d2b9f17d7756514d650936a30fd9006bf9ad90021c5ff33e355918257f14054da63a1db3237 SHA512 8b04d31307e6fccdfb0d5ebd9bc4c2b52d347c5c2c022ad9b3f342b4c2666858ac201e11acd7a15b77b22dbef287c0cf481119ea18443776b00e5b133431e723
+EBUILD w3mnav-0.5-r3.ebuild 558 BLAKE2B 293fa91c0edb66ab0a23d70035364258a80a95f07b061e3d0a245a0b8e26510d81faad4bfb1c522b98de91550aa19eb064976e9f12cf0bc9331a92f651544c14 SHA512 a60738fafd08b5bbed0903645320ddc8f8ff11efcf0515797f6e640b1e789fc3e709c184274aba7ad5f252960327874c34a63b5f68e6db2571001621189824d2
+MISC metadata.xml 707 BLAKE2B 1d5bd49093856a08c353738438e9ac097a51cd603590c4cdba44f354ffaf73ba8f00bdb38aa5b91c8f9f666234cadbb94c7c3bc93cd417b62337785f9e3b5bbd SHA512 9151618395e28b00abf69c7501bf78ec6d6f21885671a77eecad98a4a349b70235f826aaed6731dcd4bd79f0d9cb8172ff97338b3e80be5bc2f6c5d11a40f530
diff --git a/app-emacs/w3mnav/files/75w3mnav-gentoo.el b/app-emacs/w3mnav/files/75w3mnav-gentoo.el
new file mode 100644
index 000000000000..873b58e0d3dd
--- /dev/null
+++ b/app-emacs/w3mnav/files/75w3mnav-gentoo.el
@@ -0,0 +1,12 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'w3m-nav-go-top "w3mnav" nil t)
+(autoload 'w3m-nav-go-prev "w3mnav" nil t)
+(autoload 'w3m-nav-go-next "w3mnav" nil t)
+
+(add-hook 'w3m-mode-hook
+ (lambda ()
+ (setq w3m-mode-map w3m-info-like-map)
+ (define-key w3m-mode-map "t" 'w3m-nav-go-top)
+ (define-key w3m-mode-map "[" 'w3m-nav-go-prev)
+ (define-key w3m-mode-map "]" 'w3m-nav-go-next)))
diff --git a/app-emacs/w3mnav/metadata.xml b/app-emacs/w3mnav/metadata.xml
new file mode 100644
index 000000000000..7622bcba3943
--- /dev/null
+++ b/app-emacs/w3mnav/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ w3mnav.el is an Emacs add-on that kludges some Info-like navigation
+ keys to the w3m Web browser. This functionality was originally part
+ of the Scheme support package Quack, and was intended to work with
+ the numerous Scheme books that were converted to HTML from LaTeX
+ format. It also works with some other HTML pages that have book-like
+ "next page" and "previous page" links.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/w3mnav/w3mnav-0.5-r3.ebuild b/app-emacs/w3mnav/w3mnav-0.5-r3.ebuild
new file mode 100644
index 000000000000..d79f39ef371f
--- /dev/null
+++ b/app-emacs/w3mnav/w3mnav-0.5-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Add Info-like navigation keys to the emacs-w3m web browser"
+HOMEPAGE="http://www.neilvandyke.org/w3mnav/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="app-emacs/emacs-w3m"
+RDEPEND="${DEPEND}"
+
+SITEFILE="75${PN}-gentoo.el"
+
+src_compile() {
+ ${EMACS} ${EMACSFLAGS} -L "${SITELISP}/emacs-w3m" \
+ -f batch-byte-compile w3mnav.el || die "byte-compile failed"
+}
diff --git a/app-emacs/wanderlust-2.14.0-r6 b/app-emacs/wanderlust-2.14.0-r6
deleted file mode 100644
index 410075937181..000000000000
--- a/app-emacs/wanderlust-2.14.0-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/apel-10.6 virtual/emacs-flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=virtual/emacs-23
-DESCRIPTION=Yet Another Message Interface on Emacsen
-EAPI=5
-HOMEPAGE=http://www.gohome.org/wl/
-IUSE=bbdb ssl l10n_ja
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=>=app-emacs/apel-10.6 virtual/emacs-flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=ftp://ftp.gohome.org/wl/stable/wl-2.14.0.tar.gz ftp://ftp.gohome.org/wl/beta/wl-2.14.0.tar.gz mirror://gentoo/wanderlust-2.14.0-20050405.patch.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=688a39e7023189cc13e8eed0cfa09eab
diff --git a/app-emacs/wanderlust-2.15.9_p20130619 b/app-emacs/wanderlust-2.15.9_p20130619
deleted file mode 100644
index 8dc5c21e0616..000000000000
--- a/app-emacs/wanderlust-2.15.9_p20130619
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/apel-10.6 virtual/emacs-flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=virtual/emacs-23
-DESCRIPTION=Yet Another Message Interface on Emacsen
-EAPI=5
-HOMEPAGE=https://github.com/wanderlust/wanderlust https://www.emacswiki.org/emacs/WanderLust
-IUSE=bbdb ssl l10n_ja
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=>=app-emacs/apel-10.6 virtual/emacs-flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/wanderlust-2.15.9_p20130619.tar.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=59ae82792aa7a7f939d6fb612cbaf197
diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
new file mode 100644
index 000000000000..66ec28cc86cd
--- /dev/null
+++ b/app-emacs/wanderlust/Manifest
@@ -0,0 +1,9 @@
+AUX 50wanderlust-gentoo.el 244 BLAKE2B 57be93cdfb9e1854ec5841996b586843ca6e514830d2c979ba9aa400200a6514220e632985a5fd6191969ef5b8a2ff32c4d2d7edfb83017c4230028107b4ab87 SHA512 2057a8d18d5c7c91c968921799d502e02a61718d437ce9a69de68ebe4f409414a799ca7b5737a8994afd52793cf03eebce03b85311db02c441efba92f0d30233
+AUX wanderlust-2.14.0-smtp-end-of-line.patch 628 BLAKE2B 0d4252e6ee9df868c2abf68ba43f7a641a295da96830a3f907b75bac92a870391b3f610a52fa778ef130e7196c433befc3ef5b3aaa30c14248f50cddf8dcddbb SHA512 a365e24bd369dd3dcc66c45651742a33bbe847536c1362c466a64cdbcdc0908f5119e8daed70f42e2634bf4d09b9e1c4dabf8405794fa915685b1647aa5eeeef
+AUX wanderlust-2.14.0-texinfo-garbage.patch 473 BLAKE2B 390a5da8f74008b4c4c707d3ac11e8b66a9337e6b904a4072ac319ed7bee22f507a1b1dcbbb025c1ab5647e88c9da0feab4303d53e1336541f26e3f44256a279 SHA512 1f728259179beba3cc543725b5087ce2d80c9167c9f447ed60aa38225b23eef7da2a018f6150ee6eeadea0d7bf4d55269c32df9bdb4120e4a99d3955bba839ce
+DIST wanderlust-2.14.0-20050405.patch.gz 3926 BLAKE2B 0986f743e512cc7216554585c1c62af659fe35873bfcdfdb520e4085ec2606360ae1a29566ac756ad0e7f03cc51d1e5c0bd7460c8448ceb6251004d887858885 SHA512 103e8eda374eab453363f3a735d877e313ff341e09abd66093bd090b404738d42d98edf5d1c9c8e8966963bf972d462aebc28ea6e470126af9266188247c4044
+DIST wanderlust-2.15.9_p20130619.tar.xz 818124 BLAKE2B b6bbd6f63d862f81a5a0c194f0fe1b276303f75f8ffde29c844f1f7d2d8ef55f1c211ac1d0b6c3357c2507b2abe73ba1c4c8f5fc65e067d93eb6bf23fd8490a6 SHA512 91bdcc1b29370b7be7a2072f4d8c638b3c0604ba31b5419952b848af268e73a3f199f07a88caabec56f66b38013e0f9cd7c1de26b46d1062ddff782e8080d4e0
+DIST wl-2.14.0.tar.gz 1101505 BLAKE2B 5ceb3a8e294b230d48d50134e3dc07b9e19a9470907a488a2e41e53da54a8826a50cb53c06c5f3f1a5bdd1b5760bc6acd6cc75a25e63d092f1a9b80b3f073ed5 SHA512 edb49c0c9ddbd50cba4ce4cdd1b2d609cee9553d063aeb4775d0b43e0ed83cc6374aa47b11b3ff94a55827f7a9a29f7c1054e0fd9b3a5a25a2c410b241d268d2
+EBUILD wanderlust-2.14.0-r6.ebuild 1424 BLAKE2B 0219b71a6101f9e0c1de504fbcd90e1abde1f16349307b0c55c2010e8461f8a42f9f05c162c91dd0161d45d7dd17223e81cbdad3e9ef383ca225e47da6d19602 SHA512 6bf2c20f0aea275049dbb05d49b441c5a6214a8f81d9a47ea2891e150d1a70a51700c1b9189392d6aa55dd64acab4cdf9607d574094b5ab49139f12655131c24
+EBUILD wanderlust-2.15.9_p20130619.ebuild 1291 BLAKE2B 106e6e86713dd6577613e43e9c92610229e6f369564f38e130dbe001afd536f1eb037e6befd8ac68b57d7bcd395df5b06c9efff5501f0f2d601b1f51eaac0c5f SHA512 99dda215ebb42ab815073df27e7f0717e22eff119aa694425aaaaa26ed6a33ff0588412b10d2b0296f3349140e6008e40ec4f49fd5cb2919fbe39d2138468642
+MISC metadata.xml 555 BLAKE2B d79b7e7d4593193186111d653cb9f6943c0ca0a3b7b6482a1b35693727c6417ebae905b0e0d6b30912d06dfc40d22aa176b9af703cde70d0b0ee9828a1d36bf1 SHA512 338caf1728fadcca31f3c3b4d61c53150e6f3e040e0736d33a4246529ebf6ba20d1ca92dc9e04f931f619f0d1c5aa317c2c533cf1aaa0f113965cca2aa8a6c36
diff --git a/app-emacs/wanderlust/files/50wanderlust-gentoo.el b/app-emacs/wanderlust/files/50wanderlust-gentoo.el
new file mode 100644
index 000000000000..ec27dd4eb5ee
--- /dev/null
+++ b/app-emacs/wanderlust/files/50wanderlust-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'wl "wl" "Wanderlust" t)
+(autoload 'wl-other-frame "wl" "Wanderlust on new frame." t)
+(autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
+
+(setq wl-icon-directory "@SITEETC@/icons")
diff --git a/app-emacs/wanderlust/files/wanderlust-2.14.0-smtp-end-of-line.patch b/app-emacs/wanderlust/files/wanderlust-2.14.0-smtp-end-of-line.patch
new file mode 100644
index 000000000000..f03542522ed2
--- /dev/null
+++ b/app-emacs/wanderlust/files/wanderlust-2.14.0-smtp-end-of-line.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/280248
+Don't bind smtp-end-of-line. Patch from upstream CVS, by Yoichi NAKAYAMA.
+
+--- wl/wl-draft.el 28 Jan 2006 09:03:41 -0000 1.258
++++ wl/wl-draft.el 9 Feb 2006 03:57:39 -0000 1.259
+@@ -147,10 +147,6 @@
+ (if (eq wl-smtp-connection-type 'ssl)
+ #'open-ssl-stream
+ smtp-open-connection-function))
+- (smtp-end-of-line
+- (if (eq wl-smtp-connection-type 'ssl)
+- "\n"
+- smtp-end-of-line))
+ smtp-sasl-user-name smtp-sasl-properties sasl-read-passphrase)
+ (setq smtp-sasl-user-name wl-smtp-posting-user
+ smtp-sasl-properties (when wl-smtp-authenticate-realm
diff --git a/app-emacs/wanderlust/files/wanderlust-2.14.0-texinfo-garbage.patch b/app-emacs/wanderlust/files/wanderlust-2.14.0-texinfo-garbage.patch
new file mode 100644
index 000000000000..6be41a99b70c
--- /dev/null
+++ b/app-emacs/wanderlust/files/wanderlust-2.14.0-texinfo-garbage.patch
@@ -0,0 +1,11 @@
+--- wl-2.14.0-orig/doc/wl.texi 2005-02-25 16:05:48.000000000 +0100
++++ wl-2.14.0/doc/wl.texi 2009-08-10 16:15:29.000000000 +0200
+@@ -4329,7 +4329,7 @@
+
+ @item wl-summary-resend-use-cache
+ @vindex wl-summary-resend-use-cache
+-The initial setting is @code{nil}If non-nil, messages are resend
++The initial setting is @code{nil}. If non-nil, messages are resend
+ using cache even in the offline status. Note that if you use cache,
+ the message identity is not guaranteed.
+
diff --git a/app-emacs/wanderlust/metadata.xml b/app-emacs/wanderlust/metadata.xml
new file mode 100644
index 000000000000..3882ae5fdfba
--- /dev/null
+++ b/app-emacs/wanderlust/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
+<stabilize-allarches/>
+<use>
+ <flag name="bbdb">Include support for <pkg>app-emacs/bbdb</pkg></flag>
+</use>
+<upstream>
+ <remote-id type="github">wanderlust/wanderlust</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/wanderlust/wanderlust-2.14.0-r6.ebuild b/app-emacs/wanderlust/wanderlust-2.14.0-r6.ebuild
new file mode 100644
index 000000000000..1f0b3fc12a3e
--- /dev/null
+++ b/app-emacs/wanderlust/wanderlust-2.14.0-r6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+MY_P="wl-${PV/_/}"
+DESCRIPTION="Yet Another Message Interface on Emacsen"
+HOMEPAGE="http://www.gohome.org/wl/"
+SRC_URI="ftp://ftp.gohome.org/wl/stable/${MY_P}.tar.gz
+ ftp://ftp.gohome.org/wl/beta/${MY_P}.tar.gz
+ mirror://gentoo/${P}-20050405.patch.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="bbdb ssl l10n_ja"
+
+DEPEND=">=app-emacs/apel-10.6
+ virtual/emacs-flim
+ app-emacs/semi
+ bbdb? ( app-emacs/bbdb )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+ELISP_PATCHES="${P}-20050405.patch
+ ${P}-smtp-end-of-line.patch
+ ${P}-texinfo-garbage.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+ local lang="\"en\""
+ use l10n_ja && lang="${lang} \"ja\""
+ echo "(setq wl-info-lang '(${lang}) wl-news-lang '(${lang}))" >>WL-CFG
+ use ssl && echo "(setq wl-install-utils t)" >>WL-CFG
+}
+
+src_compile() {
+ emake
+ emake info
+}
+
+src_install() {
+ emake \
+ LISPDIR="${ED}${SITELISP}" \
+ PIXMAPDIR="${ED}${SITEETC}/wl/icons" \
+ install
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" wl
+
+ insinto "${SITEETC}/wl/samples/en"
+ doins samples/en/*
+ doinfo doc/wl*.info
+ dodoc BUGS ChangeLog INSTALL NEWS README
+
+ if use l10n_ja; then
+ insinto "${SITEETC}/wl/samples/ja"
+ doins samples/ja/*
+ dodoc BUGS.ja INSTALL.ja NEWS.ja README.ja
+ fi
+}
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
new file mode 100644
index 000000000000..2f035471caad
--- /dev/null
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Yet Another Message Interface on Emacsen"
+HOMEPAGE="https://github.com/wanderlust/wanderlust
+ https://www.emacswiki.org/emacs/WanderLust"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="bbdb ssl l10n_ja"
+
+DEPEND=">=app-emacs/apel-10.6
+ virtual/emacs-flim
+ app-emacs/semi
+ bbdb? ( app-emacs/bbdb )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+ local lang="\"en\""
+ use l10n_ja && lang="${lang} \"ja\""
+ echo "(setq wl-info-lang '(${lang}) wl-news-lang '(${lang}))" >>WL-CFG
+ use ssl && echo "(setq wl-install-utils t)" >>WL-CFG
+}
+
+src_compile() {
+ emake
+ emake info
+}
+
+src_install() {
+ emake \
+ LISPDIR="${ED}${SITELISP}" \
+ PIXMAPDIR="${ED}${SITEETC}/wl/icons" \
+ install
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" wl
+
+ insinto "${SITEETC}/wl/samples/en"
+ doins samples/en/*
+ doinfo doc/wl*.info
+ dodoc BUGS ChangeLog INSTALL NEWS README.md
+
+ if use l10n_ja; then
+ insinto "${SITEETC}/wl/samples/ja"
+ doins samples/ja/*
+ dodoc BUGS.ja INSTALL.ja NEWS.ja README.ja
+ fi
+}
diff --git a/app-emacs/websocket-1.10 b/app-emacs/websocket-1.10
deleted file mode 100644
index 85d661d84793..000000000000
--- a/app-emacs/websocket-1.10
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=virtual/emacs-24
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DESCRIPTION=A websocket implementation in elisp
-EAPI=7
-HOMEPAGE=https://github.com/ahyatt/emacs-websocket
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-24
-SLOT=0
-SRC_URI=https://github.com/ahyatt/emacs-websocket/archive/1.10.tar.gz -> websocket-1.10.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=67b7c84697fc173cc3a45d1aa4b19e12
diff --git a/app-emacs/websocket-1.9 b/app-emacs/websocket-1.9
deleted file mode 100644
index 8830b2ec4ec0..000000000000
--- a/app-emacs/websocket-1.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=virtual/emacs-24
-DESCRIPTION=A websocket implementation in elisp
-EAPI=6
-HOMEPAGE=https://github.com/ahyatt/emacs-websocket
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-24
-SLOT=0
-SRC_URI=https://github.com/ahyatt/emacs-websocket/archive/1.9.tar.gz -> websocket-1.9.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=26faabf678902bfaab8e819b75d7a17f
diff --git a/app-emacs/websocket/Manifest b/app-emacs/websocket/Manifest
new file mode 100644
index 000000000000..ee1684cee599
--- /dev/null
+++ b/app-emacs/websocket/Manifest
@@ -0,0 +1,6 @@
+AUX 50websocket-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST websocket-1.10.tar.gz 27108 BLAKE2B b164b3ca47e0705322d9bcd0d9535c8e84777487e8783bf599f5391c88ee6193a1ef1750ec4b3cbd4fac2968c449c4f3a140255a434f3de38e66ad7364c192ba SHA512 ef1a34eccd173eb206cd9eeb4ea988a5b076f178bd4ca903e03b2f2301a34c2cbd08e43a13c8d24a64d10da28b3a77c15b2321978460db7a6b23c601abe31197
+DIST websocket-1.9.tar.gz 27029 BLAKE2B 9a492beda1b7f7211d1a72b5af0cab445f0fa78439797f05b565a0421a798a4fe0c6fb0e24aac0454f5b48f8f536762d0fcc5d92c216bd6b83b6ac34a1e024a4 SHA512 bcd98e7edcbe95cae2f196cea05fd6cfa9083ed1ab2392530ca00cb05b87d6fa95b5f5319981fd94244b74989850c171e4c31c8758a8b7fe95d49299103a4410
+EBUILD websocket-1.10.ebuild 755 BLAKE2B a8976dea9543cc526657f5dbf8f03cc75a66286ff55668f0ff5836b0674aa875271db94f98f06a6fa0d7ddaee2f254a793b610f7922122857ecf160b46021225 SHA512 0f1989593f39be725bdb12292fdf4b51713bf8c36b11d42f04a9d73b8aa19f68cee101b054d4c5b15686778acdea4a9f32ee4e7f772ffe02724a9febc78d9e5a
+EBUILD websocket-1.9.ebuild 675 BLAKE2B 0ff94c4f36f3f470afc00e7aad5fb34f7cabfc5c6b0eafd9b58779142f7c101d4230524a8b0b23ff94e58061e54777972adfb5e89123bed0df4e198794bb16c3 SHA512 09e2563f1b81dd015213a5583d242b4740c6aaae8ef361e6a2b29aac54c3d443cceab424703620bed2cf12c63bb083836c53ac270db7db715fa50a9a0d9ab41b
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/websocket/files/50websocket-gentoo.el b/app-emacs/websocket/files/50websocket-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/websocket/files/50websocket-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/websocket/metadata.xml b/app-emacs/websocket/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/websocket/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/websocket/websocket-1.10.ebuild b/app-emacs/websocket/websocket-1.10.ebuild
new file mode 100644
index 000000000000..2211d645c5a3
--- /dev/null
+++ b/app-emacs/websocket/websocket-1.10.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A websocket implementation in elisp"
+HOMEPAGE="https://github.com/ahyatt/emacs-websocket"
+SRC_URI="https://github.com/ahyatt/emacs-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/emacs-${P}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile websocket.el
+}
+
+src_test() {
+ ${EMACS} ${EMACSFLAGS} -L . -l websocket-test \
+ -f ert-run-tests-batch-and-exit
+}
+
+src_install() {
+ elisp-install ${PN} websocket.{el,elc}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc README.org websocket-functional-test.el testserver.py
+}
diff --git a/app-emacs/websocket/websocket-1.9.ebuild b/app-emacs/websocket/websocket-1.9.ebuild
new file mode 100644
index 000000000000..00ac9a2319d5
--- /dev/null
+++ b/app-emacs/websocket/websocket-1.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A websocket implementation in elisp"
+HOMEPAGE="https://github.com/ahyatt/emacs-websocket"
+SRC_URI="https://github.com/ahyatt/emacs-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/emacs-${P}"
+
+src_compile() {
+ elisp-compile websocket.el
+}
+
+src_test() {
+ ${EMACS} ${EMACSFLAGS} -L . -l websocket-test \
+ -f ert-run-tests-batch-and-exit
+}
+
+src_install() {
+ elisp-install ${PN} websocket.{el,elc}
+ dodoc README.org websocket-functional-test.el testserver.py
+}
diff --git a/app-emacs/wgrep-2.1.10 b/app-emacs/wgrep-2.1.10
deleted file mode 100644
index cf42682e3cc9..000000000000
--- a/app-emacs/wgrep-2.1.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Writable grep buffer and apply the changes to files
-EAPI=5
-HOMEPAGE=https://github.com/mhayashi1120/Emacs-wgrep
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/wgrep-2.1.10.el.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2c3071d842cb38c7f5ae3c8e369d498c
diff --git a/app-emacs/wgrep/Manifest b/app-emacs/wgrep/Manifest
new file mode 100644
index 000000000000..5a8260bdbe0a
--- /dev/null
+++ b/app-emacs/wgrep/Manifest
@@ -0,0 +1,4 @@
+AUX 50wgrep-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST wgrep-2.1.10.el.xz 8708 BLAKE2B f3881a5b774dd9bad6169f5621d4da4662127892786e708d31815cba2ff2f5a75170863ca5882cef67efb8e27964cab4176eda7c7ca561888edeb590943ae573 SHA512 39761964406d3eedca9253f2f29f81dd9ee71c4e049a985c236ada4dd9b70dc553bf1e9e94cb6d3c8749f065146e2759a46a6ac52ed8e5e5f046e196798bc681
+EBUILD wgrep-2.1.10.ebuild 576 BLAKE2B dc5197bbdf21aa1a8ca259360fec8e41317b2fd646c7da96466de3f3db36bde8224556c837a7441c6617a82875bb3616a33abc9f9b2f26bfb366541e1297c1a8 SHA512 c39b7177e3bfe8e71fb079dbf41560214971d83f7526fff5760be3c080f4014b21a8b5b0abe7f09dea64b4130e0a617817923079b66ffea1b2f50ef1bab198fc
+MISC metadata.xml 493 BLAKE2B c8676488f610b89dab42bd037c33e1fe6af7861ad188c28e4703c7b18665102a4b2270a5c746929cad1ba11522be8e523b80712a929bc38d1ecef71b3a8b6ba3 SHA512 8af6e19dda9919614f6bb5e1dbde585fc0128d679c1ad0685eed2cd43d93e38686f1c88f1c86f0b6dfc5cc12cb7ce25c97fb4d2766d6e2cb33b1915dc9356763
diff --git a/app-emacs/wgrep/files/50wgrep-gentoo.el b/app-emacs/wgrep/files/50wgrep-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/wgrep/files/50wgrep-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/wgrep/metadata.xml b/app-emacs/wgrep/metadata.xml
new file mode 100644
index 000000000000..d76bc74d5053
--- /dev/null
+++ b/app-emacs/wgrep/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ wgrep allows you to edit a grep buffer and apply those changes to
+ the file buffer.
+</longdescription>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">mhayashi1120/Emacs-wgrep</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/wgrep/wgrep-2.1.10.ebuild b/app-emacs/wgrep/wgrep-2.1.10.ebuild
new file mode 100644
index 000000000000..69e3dc867b1a
--- /dev/null
+++ b/app-emacs/wgrep/wgrep-2.1.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+DESCRIPTION="Writable grep buffer and apply the changes to files"
+HOMEPAGE="https://github.com/mhayashi1120/Emacs-wgrep"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="See commentary in ${SITELISP}/${PN}/wgrep.el for documentation.
+ \n\nTo activate wgrep, add the following line to your ~/.emacs file:
+ \n\t(require 'wgrep)"
diff --git a/app-emacs/whine-20091222 b/app-emacs/whine-20091222
deleted file mode 100644
index 2ad614344580..000000000000
--- a/app-emacs/whine-20091222
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Complaint generator for GNU Emacs
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/Whine
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/whine-20091222.tar.bz2
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=fdf86ad9c0d6595994973414d7ffb60a
diff --git a/app-emacs/whine/Manifest b/app-emacs/whine/Manifest
new file mode 100644
index 000000000000..70c300f9c8fc
--- /dev/null
+++ b/app-emacs/whine/Manifest
@@ -0,0 +1,4 @@
+AUX 50whine-gentoo.el 158 BLAKE2B adf739f5dcd9eb718c5c6bd086090040ab6f1729bd6a7688988956a94480d90446197a99c761e61fe8d6cdc1dffe74cbb058041d39a6a34f87097719db9b7e08 SHA512 9ff30ec934a18a5b2338b15fbcc2d9e802e6b6c642d06f907ec43528fb71e6aab4a972648ac3d3a4fc493c936908fe44d2a63bf4dfe8899bcc6ed66bf1faf519
+DIST whine-20091222.tar.bz2 4452 BLAKE2B e2148ddbd06853a1bcd3aa9cd017f97e97b7fcc25b87e05017b7860d604880b48dd45e0e8c0affa07fd10ea5aac2cfecda01221fc9b297a83af1957ebb636e7a SHA512 74d02753a991140d5298f111f08fa346f458723bd1e5a46d2b67dc262fb53f513d5b39ff87eab167f37b0f2be1458ad8d0bc92479f6f9a329eb5dbf79f87fc4d
+EBUILD whine-20091222.ebuild 374 BLAKE2B 3b20d9955105b712644d6361850db25f46666633886e75f35573f384b3f1a437e299dd43a090a6fa40660dc4b5a05988c413120a3167511211333ff549fa53df SHA512 9d6bab0dd9f93c67f50990afd2351c8d24245be5593e39da33729a4f61431f5cbc72b5e87e2eb99e23aa6690a35553149415eb20db60088abbf5adc4ffc251d1
+MISC metadata.xml 703 BLAKE2B 1ed827039f386f5aa2a22f32012ad04788bfe2f0a48a3a9c451ff3304307797fe521108212acd31851527893ca01b6f3ba139ef0c111756e420dde8afab19e50 SHA512 57116838f6b93b65c272b837cac040bd20496135abda6eb762266a682a0cba0b7588bc296f5471c674c8b60d1a39bd26f5745dfd2a041b868921197e9fa6c293
diff --git a/app-emacs/whine/files/50whine-gentoo.el b/app-emacs/whine/files/50whine-gentoo.el
new file mode 100644
index 000000000000..9babd69bec38
--- /dev/null
+++ b/app-emacs/whine/files/50whine-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'whinify "whine"
+ "Make certain global-mode keys whine.
+The command `unwhinify' makes them normal again." t)
diff --git a/app-emacs/whine/metadata.xml b/app-emacs/whine/metadata.xml
new file mode 100644
index 000000000000..e9c137192beb
--- /dev/null
+++ b/app-emacs/whine/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ Whine modifies a lot of the commands bound to the main Emacs keys, like SPC
+ and C-f and RET and C-x C-s. They still do the same things they did before,
+ but they whine about it, printing messages which do not in general have
+ anything to do with reality. The main lossage is C-l, which refreshes the
+ screen and then whines about it so that you can't get a clear message line.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/whine/whine-20091222.ebuild b/app-emacs/whine/whine-20091222.ebuild
new file mode 100644
index 000000000000..78f91982e0e3
--- /dev/null
+++ b/app-emacs/whine/whine-20091222.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Complaint generator for GNU Emacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/Whine"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/wikipedia-mode-0.5-r1 b/app-emacs/wikipedia-mode-0.5-r1
deleted file mode 100644
index 238d004dd5d9..000000000000
--- a/app-emacs/wikipedia-mode-0.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=outline-magic? ( app-emacs/outline-magic ) >=virtual/emacs-23
-DESCRIPTION=Mode for editing Wikipedia articles off-line
-EAPI=5
-HOMEPAGE=https://www.emacswiki.org/emacs/WikipediaMode
-IUSE=outline-magic
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=outline-magic? ( app-emacs/outline-magic ) >=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://gentoo/wikipedia-mode-0.5.el.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=08d9ac28756db02a2c36ff1fa3910d6e
diff --git a/app-emacs/wikipedia-mode/Manifest b/app-emacs/wikipedia-mode/Manifest
new file mode 100644
index 000000000000..c129340606be
--- /dev/null
+++ b/app-emacs/wikipedia-mode/Manifest
@@ -0,0 +1,5 @@
+AUX 50wikipedia-mode-gentoo.el 287 BLAKE2B e47da9e98a8927dd34992b5e92fcd9a8d4c16bd74d80ce182fb9628b50dd5d8dd18895b519d208d93ba64201df51737608f614dceb0a36b27328d0251ae88cb3 SHA512 21fa3d8c7d1d33f61d1b8309a3b30dba79c8742bbfb41c31b75e959e15ebda8dc855d3c96f71c5ec078ccd5a96aace612490584d5a9b9f3fd32ced1781dfd305
+AUX wikipedia-mode-0.5-require-outline-magic.patch 116 BLAKE2B e04f3a458dcb2997575a2313f9cd9443c86b24fc66965151efdce53f381f03f944f732197e5182b0e452c459687ee4ddaf71c39b7086e154dedfb46a80b1eade SHA512 58b1e9474d90621f5fc1574c37b1e17be6081b6b96547e2a2e6c26571fa04a9ca015cc9dd25657edf23235c017e7d4258cd1963ebeffdbe3bf42c5cfd2fba863
+DIST wikipedia-mode-0.5.el.bz2 14243 BLAKE2B 1824548c647141bce6bce4de02d42c933b512e132e80752a13c08851dd65d5750006a59880ff55ae663747f0d1ddbb158eae60ee9c610b23c2721ad2f9798c6e SHA512 d10ddfb13e45fae347fe286df919bd9840ea0c2b38e903b451a9c3b6b6ab768566021d12b898bdc7236d034a89ba582dc8d22827bd3b4d80a0363ab323bd045d
+EBUILD wikipedia-mode-0.5-r1.ebuild 559 BLAKE2B 8485da5cc7f5ae67f3f2d5ef1ecbdb834f3f111f90fbde2a62ce4f68a89bde3ea38e9e504558753c750cd007f667192ead1a681f408939926ab3ae429dbb500c SHA512 a3d48619fc185450f2357e5a95bf27ae98ef4fc5904e0df82472148c67553c52e18b8177ac52089accb1b28ebb16bd8f82dbb1cafe01c13d1ec30a5f54478342
+MISC metadata.xml 741 BLAKE2B b4226f5fb806c976f39ad05b8ca536fa4f7c3db463aedbb08645409180daf83d808ea5721ab162c7df72757688a3e4f99d16774d72d43c7434f72c4c87b3b7ca SHA512 1953def9c360a467583c957d31872124f3d6fd985d65625eef7c71ba561ccde997bbe9c507edd1fad3d4bbd336d015028a6012f0c3d7a571329a83af6cbba96f
diff --git a/app-emacs/wikipedia-mode/files/50wikipedia-mode-gentoo.el b/app-emacs/wikipedia-mode/files/50wikipedia-mode-gentoo.el
new file mode 100644
index 000000000000..1c302088ec70
--- /dev/null
+++ b/app-emacs/wikipedia-mode/files/50wikipedia-mode-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'wikipedia-mode "wikipedia-mode"
+ "Major mode for editing documents in Wikipedia markup." t)
+
+(add-to-list 'auto-mode-alist '("\\.wiki\\'" . wikipedia-mode))
+(add-to-list 'auto-mode-alist '("/[a-z]+\\.wikipedia\\.org" . wikipedia-mode))
diff --git a/app-emacs/wikipedia-mode/files/wikipedia-mode-0.5-require-outline-magic.patch b/app-emacs/wikipedia-mode/files/wikipedia-mode-0.5-require-outline-magic.patch
new file mode 100644
index 000000000000..caefca757631
--- /dev/null
+++ b/app-emacs/wikipedia-mode/files/wikipedia-mode-0.5-require-outline-magic.patch
@@ -0,0 +1,6 @@
+--- wikipedia-mode.el~
++++ wikipedia-mode.el
+@@ -386,2 +386,3 @@
+ (require 'font-lock)
++(require 'outline-magic)
+
diff --git a/app-emacs/wikipedia-mode/metadata.xml b/app-emacs/wikipedia-mode/metadata.xml
new file mode 100644
index 000000000000..71b93aeb32fc
--- /dev/null
+++ b/app-emacs/wikipedia-mode/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ An Emacs major mode for editing articles in Wikipedia and other wikis
+ running MediaWiki software offline. This mode tweaks Emacs's behavior in
+ several ways to make it easier to edit MediaWiki articles. In particular,
+ wikipedia-mode provides syntax highlighting for MediaWiki markup.
+</longdescription>
+<stabilize-allarches/>
+<use>
+ <flag name="outline-magic">Enable support for outline-mode extensions
+ (<pkg>app-emacs/outline-magic</pkg>)</flag>
+</use>
+</pkgmetadata>
diff --git a/app-emacs/wikipedia-mode/wikipedia-mode-0.5-r1.ebuild b/app-emacs/wikipedia-mode/wikipedia-mode-0.5-r1.ebuild
new file mode 100644
index 000000000000..89c4f20828bb
--- /dev/null
+++ b/app-emacs/wikipedia-mode/wikipedia-mode-0.5-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp eutils
+
+DESCRIPTION="Mode for editing Wikipedia articles off-line"
+HOMEPAGE="https://www.emacswiki.org/emacs/WikipediaMode"
+SRC_URI="mirror://gentoo/${P}.el.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="outline-magic"
+
+DEPEND="outline-magic? ( app-emacs/outline-magic )"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ use outline-magic && epatch "${FILESDIR}/${P}-require-outline-magic.patch"
+}
diff --git a/app-emacs/windows-2.49 b/app-emacs/windows-2.49
deleted file mode 100644
index 7c81d4eee5d2..000000000000
--- a/app-emacs/windows-2.49
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/revive >=virtual/emacs-23
-DESCRIPTION=Window manager for GNU Emacs
-EAPI=6
-HOMEPAGE=http://www.gentei.org/~yuuji/software/
-KEYWORDS=~amd64
-LICENSE=yuuji
-RDEPEND=app-emacs/revive >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/gavv/distfiles/raw/master/windows-2.49.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=9c6a2d43c06f511f5d9069322a3e25b9
diff --git a/app-emacs/windows/Manifest b/app-emacs/windows/Manifest
new file mode 100644
index 000000000000..20ea42477652
--- /dev/null
+++ b/app-emacs/windows/Manifest
@@ -0,0 +1,4 @@
+AUX 50windows-gentoo.el 71 BLAKE2B b0bdccf744fea902944facc65fc45d69a1b67c0a7517514731cad427be77d09c7a3263634e91a887dc4cd7344e15cefb794f7da2403b9fd8778d4f8594dae760 SHA512 9ee731d8d54d7808903fea39ca70fee4d9216f6980f02b8511b6d643040335acfdad2a9336d9c8baa9babf0805f9eef5ace760cd0e965c6c964a2bd7599e5d6d
+DIST windows-2.49.el.xz 26240 BLAKE2B 161003a6b995b84df79eb0459ddfce41049ffcd053cacb2d5ceefda89afae0eb82f382b7f60b267846bd8690f406a5fcea166c6e602378729140f8e951977265 SHA512 de75f2c07cd544de7e7c616b5b928c0dd538b341396819a49525304ed3d9c01c4814e0f8a8da97bdf1a449844605127da690db3ccd95980240156d3c3600b704
+EBUILD windows-2.49.ebuild 543 BLAKE2B 8598f19c18b66fedded09b7dad20b9f7b747fa9f65e5ae396ee0663d3596e779626235e1190a47355fd72288b1799bb6e06d9a166fd0d53ea89b07025c3beb37 SHA512 01e8aa63f4f4cf212737c906a11ed1cb7291c70f54cc8c432d1eef6bac694f7b81724645274ff35932592a264910d829719f8a11b904bffb4505773e56d86dbf
+MISC metadata.xml 292 BLAKE2B 046265ce3ff94f04bba9b4b344d852203657df8dd300f30620df260bad1c56b3c23a8c48d073f70f571f733af9a7c034922e0465878028ee8f748060a6816ec6 SHA512 f0115ae686d3003f4264968d3aeb0b054830f87f35378e15e205a729d591c8697507d3c76ead9e1f0bab1f1f66a3fda108322dbcec7b857a37000511d1dd17df
diff --git a/app-emacs/windows/files/50windows-gentoo.el b/app-emacs/windows/files/50windows-gentoo.el
new file mode 100644
index 000000000000..892a4208f52f
--- /dev/null
+++ b/app-emacs/windows/files/50windows-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "windows-autoloads" nil t)
diff --git a/app-emacs/windows/metadata.xml b/app-emacs/windows/metadata.xml
new file mode 100644
index 000000000000..c6a53b949e75
--- /dev/null
+++ b/app-emacs/windows/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/windows/windows-2.49.ebuild b/app-emacs/windows/windows-2.49.ebuild
new file mode 100644
index 000000000000..75cecc5d2318
--- /dev/null
+++ b/app-emacs/windows/windows-2.49.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="Window manager for GNU Emacs"
+HOMEPAGE="http://www.gentei.org/~yuuji/software/"
+# taken from http://www.gentei.org/~yuuji/software/euc/windows.el
+SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
+
+LICENSE="yuuji"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-emacs/revive"
+DEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ elisp-compile *.el
+ elisp-make-autoload-file
+}
diff --git a/app-emacs/with-editor-2.6.0 b/app-emacs/with-editor-2.6.0
deleted file mode 100644
index 0475b45a0b83..000000000000
--- a/app-emacs/with-editor-2.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-24
-DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
-EAPI=6
-HOMEPAGE=https://magit.vc/manual/with-editor
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=!!<app-emacs/magit-2.5.0 >=virtual/emacs-24
-SLOT=0
-SRC_URI=https://github.com/magit/with-editor/archive/v2.6.0.tar.gz -> with-editor-2.6.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=dc3c2676a35393f51aaf7231721280f6
diff --git a/app-emacs/with-editor-2.7.2 b/app-emacs/with-editor-2.7.2
deleted file mode 100644
index c9a82b89545a..000000000000
--- a/app-emacs/with-editor-2.7.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-24
-DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
-EAPI=6
-HOMEPAGE=https://magit.vc/manual/with-editor
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=!!<app-emacs/magit-2.5.0 >=virtual/emacs-24
-SLOT=0
-SRC_URI=https://github.com/magit/with-editor/archive/v2.7.2.tar.gz -> with-editor-2.7.2.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=dc3c2676a35393f51aaf7231721280f6
diff --git a/app-emacs/with-editor-2.7.3 b/app-emacs/with-editor-2.7.3
deleted file mode 100644
index 207b3869ec4c..000000000000
--- a/app-emacs/with-editor-2.7.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=sys-apps/texinfo >=virtual/emacs-24
-DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
-EAPI=6
-HOMEPAGE=https://magit.vc/manual/with-editor
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=!!<app-emacs/magit-2.5.0 >=virtual/emacs-24
-SLOT=0
-SRC_URI=https://github.com/magit/with-editor/archive/v2.7.3.tar.gz -> with-editor-2.7.3.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=2c49a44445182efbcb660b1e7dece1e1
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
new file mode 100644
index 000000000000..c4e531fa792a
--- /dev/null
+++ b/app-emacs/with-editor/Manifest
@@ -0,0 +1,8 @@
+AUX 50with-editor-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST with-editor-2.6.0.tar.gz 28124 BLAKE2B b727fc645cba8c85e0ff688ffbb7fd165feeb3e2fe5033475d9f9b333435cdbb4bc6e0c05f862021c1cd32dcdf1c813a0d3a8fb6221a757c7cf4ee4853d40272 SHA512 454af6222f54b6695aedb085b6f9a4e60d4ebd9dd6047d67cba13087d3966670aa63358dff45633f3492152f6a15c4c1e92efbaaa787867fef9edcf8b14f690c
+DIST with-editor-2.7.2.tar.gz 30121 BLAKE2B a610348a3a2b26059bf58b4b26fdb4e2edddcf70604db7c9d69d2050f4ed1ac745cf94638656339a915ac11a2abe0e8eee5fcb73c768747a8d14078931106332 SHA512 9d412928ce5234d3541d717b5b800312c82495f937088cb8308ff64ab92d2639ce078cdc8eb86d34b775a0e6567409249d58d94eb61183b82b5c19e2465905a7
+DIST with-editor-2.7.3.tar.gz 30133 BLAKE2B af4455f06f5aa867fa7b57222b62a060dd325bea8ef4b408177666914cb97a4f614f13daaf281fe9ca65b90e94dbda33fcb845e822e025ed8b415c4d0d01d3a9 SHA512 1c613e49bfe4a9812e69ec62d6518b29e59bfde84c83097323dfa3274da7fe4ff6431c0ebcbbc889c2237bc535d7cdb2ab7ab1dd171b26e553f03dcf71efd09c
+EBUILD with-editor-2.6.0.ebuild 648 BLAKE2B 04711d6eb908747d7f6d6043f4460b20e4d9f0aabe88c416cb1dc384f68c6109ea8f623c49780c31e5da572b79905ee206d3152158239f7fb02393fa058733a8 SHA512 39ead2bcf75c013d858a46192058c928bc20bd35de52cd8b572138df7506145091220d4c637867418b1a3c211acc1dfbd655fec0f0001b459e2689b4f8de9e1f
+EBUILD with-editor-2.7.2.ebuild 648 BLAKE2B 04711d6eb908747d7f6d6043f4460b20e4d9f0aabe88c416cb1dc384f68c6109ea8f623c49780c31e5da572b79905ee206d3152158239f7fb02393fa058733a8 SHA512 39ead2bcf75c013d858a46192058c928bc20bd35de52cd8b572138df7506145091220d4c637867418b1a3c211acc1dfbd655fec0f0001b459e2689b4f8de9e1f
+EBUILD with-editor-2.7.3.ebuild 650 BLAKE2B ee112b0810c2887cff5b32f8d908e554418047ae5e1a849e22f52c7c86cd4c91df74ace9abf52e0aabe1940fac4646a2329fc6575953ba3a5e6706f739c5880f SHA512 71ea9ef54e63f64f229e64119475368156b8858f1ab20d9af1755bb61ceae632075af6287ad42546f0b9eb441fdd8d1ede739d0fc9129d4c022892f947b39613
+MISC metadata.xml 707 BLAKE2B 7f4c983cfd2f8b87a3708301ccc570a0d88b3d9b21b3e089e44dc5b22f8313826d2469efabe7ff4dc2b27262f93dc4b5e8fe0e68b2b3b7a6f79fa6f34283eeab SHA512 bce73ef41113175585cc46d00fc1306537c71f860b1f2d699c086f2b1042d26fb02e9770122c586594ab9012eeea0fa73438a2fb9a9cf3b2c077481eef13a5b6
diff --git a/app-emacs/with-editor/files/50with-editor-gentoo.el b/app-emacs/with-editor/files/50with-editor-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/with-editor/files/50with-editor-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/with-editor/metadata.xml b/app-emacs/with-editor/metadata.xml
new file mode 100644
index 000000000000..3600f86305bf
--- /dev/null
+++ b/app-emacs/with-editor/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ This library makes it possible to reliably use the Emacsclient as
+ the $EDITOR of child processes. It makes sure that they know how to
+ call home. For remote processes a substitute is provided, which
+ communicates with Emacs on standard output/input instead of using a
+ socket as the Emacsclient does.
+</longdescription>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">magit/with-editor</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/with-editor/with-editor-2.6.0.ebuild b/app-emacs/with-editor/with-editor-2.6.0.ebuild
new file mode 100644
index 000000000000..075601caf822
--- /dev/null
+++ b/app-emacs/with-editor/with-editor-2.6.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
+HOMEPAGE="https://magit.vc/manual/with-editor"
+SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md with-editor.org"
+
+DEPEND=""
+# Versions of magit before 2.5.0 bundled with-editor
+RDEPEND="!!<app-emacs/magit-2.5.0 ${DEPEND}"
+DEPEND="${DEPEND} sys-apps/texinfo"
diff --git a/app-emacs/with-editor/with-editor-2.7.2.ebuild b/app-emacs/with-editor/with-editor-2.7.2.ebuild
new file mode 100644
index 000000000000..075601caf822
--- /dev/null
+++ b/app-emacs/with-editor/with-editor-2.7.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
+HOMEPAGE="https://magit.vc/manual/with-editor"
+SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md with-editor.org"
+
+DEPEND=""
+# Versions of magit before 2.5.0 bundled with-editor
+RDEPEND="!!<app-emacs/magit-2.5.0 ${DEPEND}"
+DEPEND="${DEPEND} sys-apps/texinfo"
diff --git a/app-emacs/with-editor/with-editor-2.7.3.ebuild b/app-emacs/with-editor/with-editor-2.7.3.ebuild
new file mode 100644
index 000000000000..e967a12c4df8
--- /dev/null
+++ b/app-emacs/with-editor/with-editor-2.7.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
+HOMEPAGE="https://magit.vc/manual/with-editor"
+SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md with-editor.org"
+
+DEPEND=""
+# Versions of magit before 2.5.0 bundled with-editor
+RDEPEND="!!<app-emacs/magit-2.5.0 ${DEPEND}"
+DEPEND="${DEPEND} sys-apps/texinfo"
diff --git a/app-emacs/xclip-1.3 b/app-emacs/xclip-1.3
deleted file mode 100644
index 4528031568e7..000000000000
--- a/app-emacs/xclip-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs Interface to XClip
-EAPI=5
-HOMEPAGE=https://elpa.gnu.org/packages/xclip.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=x11-misc/xclip >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xclip-1.3.el.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8da3c8200ce64b7fa2322c2b70402420
diff --git a/app-emacs/xclip/Manifest b/app-emacs/xclip/Manifest
new file mode 100644
index 000000000000..099feb72f471
--- /dev/null
+++ b/app-emacs/xclip/Manifest
@@ -0,0 +1,4 @@
+AUX 50xclip-gentoo.el 128 BLAKE2B 8a5ecef89d13e7f65cf59c868adf5c984ff5dc30eedbfa23180f8c0d87a07c54215222fbbc38d0ade389aef2cbd9be1e584b31fd9f9a002f6893e689b8533230 SHA512 beadac08608ab6a45e5162ccb993b7ef99e9f3b811f144a49eb6caae25602f4346bfe15c9771177f0d9495929f92eb1e5e59b60f5957551beb7dd69340ed416c
+DIST xclip-1.3.el.xz 2164 BLAKE2B 739cad92a92732a12ac077fc9749bc883b4386977d4c47e793023811c1e668668277f6e0a6bc7105cb7a1186c0d6b3ab276dfb655478d5a6063882f60fa9a7e6 SHA512 5b51703a365fa3991a97c06734b6baf6473ba672ab2ed572db45330fc6b761258403191079725f8c3e8d72919355a2cadf0c04e31396805718de30474ac08520
+EBUILD xclip-1.3.ebuild 480 BLAKE2B e8d7f48160c6852838d55a08f86717e77aab25d7829324d90cd2887f96890977746e681191f135a0d4af827247514cd48a218ab1634fae4236a9683b21df80f1 SHA512 8d4fdd7e8057b31952f54f9da9eb894116dc591c6ec39141d68a288b9b79016d7747dcaeb9679e437c155664eceaa6a9765c7b106a9514cd913a1e29f425af21
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/xclip/files/50xclip-gentoo.el b/app-emacs/xclip/files/50xclip-gentoo.el
new file mode 100644
index 000000000000..32fe005725b4
--- /dev/null
+++ b/app-emacs/xclip/files/50xclip-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'xclip-mode "xclip"
+ "Minor mode to use the `xclip' program to copy&paste." t)
diff --git a/app-emacs/xclip/metadata.xml b/app-emacs/xclip/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/xclip/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/xclip/xclip-1.3.ebuild b/app-emacs/xclip/xclip-1.3.ebuild
new file mode 100644
index 000000000000..4b0c38d1a017
--- /dev/null
+++ b/app-emacs/xclip/xclip-1.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo elisp
+
+DESCRIPTION="Emacs Interface to XClip"
+HOMEPAGE="https://elpa.gnu.org/packages/xclip.html"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-misc/xclip"
+
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="To enable xclip-mode, add (xclip-mode 1) to your ~/.emacs file."
diff --git a/app-emacs/xrdb-mode-3.0 b/app-emacs/xrdb-mode-3.0
deleted file mode 100644
index 49f010650678..000000000000
--- a/app-emacs/xrdb-mode-3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=An Emacs major mode for editing X resource database files
-EAPI=5
-HOMEPAGE=https://launchpad.net/xrdb-mode https://www.emacswiki.org/emacs/ResourceFiles
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xrdb-mode-3.0.el.xz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=541145a3b5eb70361e5e41b30fe467c7
diff --git a/app-emacs/xrdb-mode/Manifest b/app-emacs/xrdb-mode/Manifest
new file mode 100644
index 000000000000..3bf36d2f8e46
--- /dev/null
+++ b/app-emacs/xrdb-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50xrdb-mode-gentoo.el 223 BLAKE2B 2d2d85455f676760bcce88965406a226528da07d29f34b409c35f539e2dafe6750a35e6472194c0969fec7dda3a04abb65ded5dd6b1be3ea0a0cd63fa9a2f03d SHA512 324609b05517c26d58759bf3c4445b690bb8c8ab00361f3157b06964458f9ca777d8963ac9c5e49df6c75d4d8eb27ea7754639bbbb8d1550b96fdbc954b3ed5b
+DIST xrdb-mode-3.0.el.xz 5448 BLAKE2B 32ce6b427ab2338d66a52c722ae3c69e1966c53cd63be15c35e218b17cb2c7476da5d5c1e49df3df1114b97382724f273f2f302abaef5995b5aa53824673867a SHA512 1ad0f92edf08cca604b9534a5a715f79d019f73f8ad80bf8297fa3b4a201f8dbd864c23bed86579b7c48ddd9180add7b39e22469f6c23dceef4be9fdfd1ae290
+EBUILD xrdb-mode-3.0.ebuild 505 BLAKE2B bf3d1f240e3be4d56e1315cad7bf5c14d962196d7f55f74720e5cd7a8ef2519aeea2f9b04d9bfcf444b2b90afa7bd22eb128b0d9e52027a6a1917ff27a44c503 SHA512 6da052641466348b40dd059761a3591dbe69bc7750650088367fe14034d5e7b799aaa7f33087fca4277d287128b33ae53fa5fbd89230aa2641c8e36c2236b82c
+MISC metadata.xml 357 BLAKE2B 5f0984d66c30be81bdd275c54b1171fc16a714b95f74da7700518cfece8d773433d1ce8151968849ebc3b02c255686e086e2f2282fd9b09a340c2c24da48b334 SHA512 3a98228940548b16f0ff1e6a33bc4d5a2c0d4b650187533dfd431e8c1fbcc59c3c5587a9df1d2bbfcf8c161ade94af51a5b95475fe3900e68108dd86924904d7
diff --git a/app-emacs/xrdb-mode/files/50xrdb-mode-gentoo.el b/app-emacs/xrdb-mode/files/50xrdb-mode-gentoo.el
new file mode 100644
index 000000000000..3cbe7466ec08
--- /dev/null
+++ b/app-emacs/xrdb-mode/files/50xrdb-mode-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'xrdb-mode "xrdb-mode" "Major mode for editing xrdb config files." t)
+(add-to-list
+ 'auto-mode-alist
+ '("\\.\\(Xdefaults\\|Xenvironment\\|Xresources\\|ad\\)\\'" . xrdb-mode))
diff --git a/app-emacs/xrdb-mode/metadata.xml b/app-emacs/xrdb-mode/metadata.xml
new file mode 100644
index 000000000000..1e21f2e7a27a
--- /dev/null
+++ b/app-emacs/xrdb-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="launchpad">xrdb-mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/xrdb-mode/xrdb-mode-3.0.ebuild b/app-emacs/xrdb-mode/xrdb-mode-3.0.ebuild
new file mode 100644
index 000000000000..1405fd18bf3e
--- /dev/null
+++ b/app-emacs/xrdb-mode/xrdb-mode-3.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Emacs major mode for editing X resource database files"
+HOMEPAGE="https://launchpad.net/xrdb-mode
+ https://www.emacswiki.org/emacs/ResourceFiles"
+# taken from https://launchpad.net/${PN}/trunk/3.0/+download/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/xslide-0.2.2 b/app-emacs/xslide-0.2.2
deleted file mode 100644
index a9b673ecc19e..000000000000
--- a/app-emacs/xslide-0.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-arch/unzip >=virtual/emacs-23
-DESCRIPTION=An Emacs major mode for editing XSL stylesheets and running XSL processes
-EAPI=4
-HOMEPAGE=http://www.menteith.com/wiki/xslide
-KEYWORDS=alpha amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=mirror://sourceforge/xslide/xslide-0.2.2.zip
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=a3ebcd4d5cbb38412e32052f6098683a
diff --git a/app-emacs/xslide/Manifest b/app-emacs/xslide/Manifest
new file mode 100644
index 000000000000..c38eb264194f
--- /dev/null
+++ b/app-emacs/xslide/Manifest
@@ -0,0 +1,4 @@
+AUX 50xslide-gentoo.el 264 BLAKE2B 8a3cbd3159bcd3092e381e702576987e7f2389732063d7e0b0aaa84f98b1b975d4462ccdc1ac17603ede616eb052887c8da9df489c62ab2b9f0c9424072062bb SHA512 54dfb6e7d40591dcf7ee5625ded053056305eb72c64f3808758d20b9c9fdbc78f914765909c44ff9685b075f5d87e03a94afea156b179d6ae16275d1f9ad05e8
+DIST xslide-0.2.2.zip 29051 BLAKE2B d29bfb9b932c1370d51695ccc00d16e6d0c3ea5025f42281df51bed016cead5bdaef95dbc2fc538ba493641ca799b7a048f48b659692e975feaf5ae8b545f1ec SHA512 df658464517704289d2695faed02d733adea9f5858310b497d66bf103be5c3e1c3635aa1aa3c93f63c64cd2927b4948e53e7b2593622564f5292c583d6e245a8
+EBUILD xslide-0.2.2.ebuild 520 BLAKE2B 0b5041a161c7c35187303f44729479153957d10effa5cac35f1418b0284e5b4c755c80f7b0cf07a5626c59d5d90920beeeb9ea941f0bc609c7da67de0aef88ce SHA512 4b3895a41210215deb5aba2172d31aacf64f3869e2a178c3d8c42c735aff544874cce557e6e09b0ffa7c20be6bc4a8a17cc0568ad49c6ebc928ede3db92e2dc1
+MISC metadata.xml 356 BLAKE2B 6b8ff8b4ccbc7f2c5c85c154ec1eb694bb83306d9832227556873cea83a29684b63ec6e95fefcf3cec83e8f3585c00882f12186d37aed81f022aae04c1c8019e SHA512 ee8540b29674e44b7aa072c02ca5031df5c5283c1eaaab2ca6a549dce024c40e25a2316949d7997951f8db69322e592d5efcd59a4f9e4480ccda668d096459d8
diff --git a/app-emacs/xslide/files/50xslide-gentoo.el b/app-emacs/xslide/files/50xslide-gentoo.el
new file mode 100644
index 000000000000..3ae228472f1b
--- /dev/null
+++ b/app-emacs/xslide/files/50xslide-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'xsl-mode "xslide" "Major mode for XSL stylesheets." t)
+;; Turn on font lock when in XSL mode
+(add-hook 'xsl-mode-hook
+ 'turn-on-font-lock)
+(add-to-list 'auto-mode-alist
+ '("\\.fo\\'\\|\\.xsl\\'" . xsl-mode))
diff --git a/app-emacs/xslide/metadata.xml b/app-emacs/xslide/metadata.xml
new file mode 100644
index 000000000000..41378e590a8f
--- /dev/null
+++ b/app-emacs/xslide/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="sourceforge">xslide</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/xslide/xslide-0.2.2.ebuild b/app-emacs/xslide/xslide-0.2.2.ebuild
new file mode 100644
index 000000000000..b24dd16862b3
--- /dev/null
+++ b/app-emacs/xslide/xslide-0.2.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="An Emacs major mode for editing XSL stylesheets and running XSL processes"
+HOMEPAGE="http://www.menteith.com/wiki/xslide"
+SRC_URI="mirror://sourceforge/xslide/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog NEWS README.TXT TODO"
+
+src_compile() {
+ emake EMACS=emacs
+}
diff --git a/app-emacs/yaml-mode-0.0.13 b/app-emacs/yaml-mode-0.0.13
deleted file mode 100644
index bab03212e0ed..000000000000
--- a/app-emacs/yaml-mode-0.0.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A major mode for GNU Emacs for editing YAML files
-EAPI=6
-HOMEPAGE=https://github.com/yoshiki/yaml-mode
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/yoshiki/yaml-mode/archive/v0.0.13.tar.gz -> yaml-mode-0.0.13.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=029b1ca777a1da09d6ec863765f4f768
diff --git a/app-emacs/yaml-mode-0.0.9 b/app-emacs/yaml-mode-0.0.9
deleted file mode 100644
index 30d8827fc2e2..000000000000
--- a/app-emacs/yaml-mode-0.0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=A major mode for GNU Emacs for editing YAML files
-EAPI=5
-HOMEPAGE=https://github.com/yoshiki/yaml-mode
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/yoshiki/yaml-mode/archive/release-0.0.9.tar.gz -> yaml-mode-0.0.9.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=6f74d08498ab0bb9fcf670a1a7313371
diff --git a/app-emacs/yaml-mode/Manifest b/app-emacs/yaml-mode/Manifest
new file mode 100644
index 000000000000..692b5127b6a0
--- /dev/null
+++ b/app-emacs/yaml-mode/Manifest
@@ -0,0 +1,6 @@
+AUX 50yaml-mode-gentoo.el 175 BLAKE2B b1af91b34a21808f9be3d19cc4d713706cf3537d9a7246fa5dd8f483af1d10aa17724ccd861cf20103430424f49b7e223f698e1483bdfd8c9840352e2ef730d3 SHA512 2a783a62a6eb12c66829b989d1685fc78bd819beb1478e94049a5beeb9f43a6d7d5b541a81622faec61f9a02361730d545979440858b2552ccb86930ac2392a1
+DIST yaml-mode-0.0.13.tar.gz 14446 BLAKE2B c80750aa78cc10342c5873d5227a2e2b7e0a1d9bdd9ee20f9c5a596e3b43a3344f9a0746eb77cc0cff4da2731cba41c5b52c8dd045d2376ee195d8103bbb7e19 SHA512 10876dfe576045bde363f62880ab3c91894d965c9dc1b7ff2b86783d31c05ab844c0abd77bcb1f7b5346d99969d69833ff4e5dc1b5700f7856fbd3dc4eebd5ef
+DIST yaml-mode-0.0.9.tar.gz 6498 BLAKE2B aa491c9cff93ebb9a8e04ef6ff4205a020986ae1e390c1e7424b5ca6b067d65ccd711fdc494164eccfc1639273d346350d8ca102be7979a49116eacf34e3aace SHA512 cdfb0694d2efe5bb86ab5280e78d577d5bdac906a7745c6e988128cbb001f1f78569199288e2c12e7977a35c35f9e47f3271747bf26fcdfab5d2a961295550ea
+EBUILD yaml-mode-0.0.13.ebuild 485 BLAKE2B bbd2a59d8174499f47c5605a480c27ae85233b8868086d4daefe5aead63b36d79b8906e99659451b1a595d0594ee40093da4810aa066cd60d667a20e899ad3e9 SHA512 a48d40bccba134cedc15d4962d342d8ecaf4a2c01e3e51f732aa1ace2de89ea7cd3969161e686bb5353443e9ddd847792222799cb32f4b8efde8eb53e28f633d
+EBUILD yaml-mode-0.0.9.ebuild 491 BLAKE2B 35206aecb29c1706b8564fa3b2e5fd3400209300a4158840fdd250ead7d5f146a279a56a745661e8a3bbc1b82c1050a893749864074665df9e1927f80e1b6431 SHA512 217691054b5184bad857d4c764c8a7aa98a9007b726748941d4268b0967f2ec7dbb50ca226ac74dbb3627cbbc80e0dce77f5a794cfa11d77435b481f8846dab1
+MISC metadata.xml 362 BLAKE2B 2d556a49f9dac87b5befc237980704a75c026760b0d59b8c5a67e138d206fd6e3bcc8a79089feacbf0107c890164f3ff4007e1f84f9974b005ce35dc1435746f SHA512 c8209f35f82e0d5cc7879d9a9a8fa94c7a78a6848fa5071b868e5b692c743236daf6552c3d44a08760998ff1e008c39d9aabdd39f1b96fcdd94743c52c1baafe
diff --git a/app-emacs/yaml-mode/files/50yaml-mode-gentoo.el b/app-emacs/yaml-mode/files/50yaml-mode-gentoo.el
new file mode 100644
index 000000000000..7f6db15560f4
--- /dev/null
+++ b/app-emacs/yaml-mode/files/50yaml-mode-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'yaml-mode "yaml-mode" "Simple mode to edit YAML." t)
+(add-to-list 'auto-mode-alist '("\\.\\(e?ya?\\|ra\\)ml\\'" . yaml-mode))
diff --git a/app-emacs/yaml-mode/metadata.xml b/app-emacs/yaml-mode/metadata.xml
new file mode 100644
index 000000000000..7f1a74fd3403
--- /dev/null
+++ b/app-emacs/yaml-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">yoshiki/yaml-mode</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/yaml-mode/yaml-mode-0.0.13.ebuild b/app-emacs/yaml-mode/yaml-mode-0.0.13.ebuild
new file mode 100644
index 000000000000..36ae75dea89c
--- /dev/null
+++ b/app-emacs/yaml-mode/yaml-mode-0.0.13.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="A major mode for GNU Emacs for editing YAML files"
+HOMEPAGE="https://github.com/yoshiki/yaml-mode"
+SRC_URI="https://github.com/yoshiki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+#S="${WORKDIR}/${PN}-release-${PV}"
+DOCS="README Changes"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/yaml-mode/yaml-mode-0.0.9.ebuild b/app-emacs/yaml-mode/yaml-mode-0.0.9.ebuild
new file mode 100644
index 000000000000..68086fa87d01
--- /dev/null
+++ b/app-emacs/yaml-mode/yaml-mode-0.0.9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A major mode for GNU Emacs for editing YAML files"
+HOMEPAGE="https://github.com/yoshiki/yaml-mode"
+SRC_URI="https://github.com/yoshiki/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+DOCS="README Changes"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/yasnippet-0.13.0 b/app-emacs/yasnippet-0.13.0
deleted file mode 100644
index 3dc15c21090d..000000000000
--- a/app-emacs/yasnippet-0.13.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Yet another snippet extension for Emacs
-EAPI=6
-HOMEPAGE=http://joaotavora.github.com/yasnippet/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/joaotavora/yasnippet/archive/0.13.0.tar.gz -> yasnippet-0.13.0.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=bd888dc018b439f9ef025d6d6d9c8afa
diff --git a/app-emacs/yasnippet-snippets-0.3 b/app-emacs/yasnippet-snippets-0.3
deleted file mode 100644
index 32aa89da02fc..000000000000
--- a/app-emacs/yasnippet-snippets-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=virtual/emacs-23
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=A collection of yasnippet snippets for many languages
-EAPI=7
-HOMEPAGE=https://github.com/AndreaCrotti/yasnippet-snippets
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=app-emacs/yasnippet >=virtual/emacs-23
-SLOT=0
-SRC_URI=https://github.com/AndreaCrotti/yasnippet-snippets/archive/0.3.tar.gz -> yasnippet-snippets-0.3.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=aa9a65c265773043b88e1e4239cd3d42
diff --git a/app-emacs/yasnippet-snippets/Manifest b/app-emacs/yasnippet-snippets/Manifest
new file mode 100644
index 000000000000..63e939c5d2de
--- /dev/null
+++ b/app-emacs/yasnippet-snippets/Manifest
@@ -0,0 +1,4 @@
+AUX 50yasnippet-snippets-gentoo.el 161 BLAKE2B af28f32bcf248a9557c25e4afd50110b6fdeb8f376b41ba645da1ee3c39429cf6b967bc77ce60f29a28d7dc01903a620997cb9a6bf7a62628bd3ff7495f8a015 SHA512 f675ccdd153f0c386d384df2db90598c08f2d49cadc434d1bba7707a7681b0d1dfa410bf188250b05003544c17bba11b132d9d8f3741865cf64ccce5b117c4d4
+DIST yasnippet-snippets-0.3.tar.gz 97229 BLAKE2B 26fe83c35be1b20b6a1e414144149cf1feaf4463833634bbd0a3db6f56b1da46d8e379c3dd19217cfd36f12cb9dc796eac4efef5c2ba472ce79f8c8b8d816969 SHA512 4aaac9d7c880642a1e802abb98bd6d6c94557fe0e609db5ce5b4ce2af921235d3e6bb2488c052adbe2940d41e85297520081ae0847b52642bc97610e6614727f
+EBUILD yasnippet-snippets-0.3.ebuild 614 BLAKE2B 73559131e05601b6a1f80ee513e8a2eef5f718d9b037476adfe2dfdb9d15162ee0dc6e2b249851aa1e3aef2ebf0b9363eab6f9e2996adf1d5c19496d75b3012c SHA512 d9d3d0044e4a527ce6b8b0e93f9ec4e63ac0a331d2834c9d283d9cd5f00c0627ece69b5ae17e346401cd345ec32a2daf97f7c86e1833980de2689b85bf0bb89b
+MISC metadata.xml 376 BLAKE2B 5543f1c655073ed989fc85bc12f70d4d2e97ded791731d821a42eb564a7d8eeeb463e256d73d0cd9363b2f9dae76e5ae449bd2b8d7c9b06f3f043eca8940be46 SHA512 a4c941baae34f15f6368e0ac37c7c622b5131dfc2e78957c4563cb211eb16ca0bf2745b641ed5883ec1ad67f00d658a53290624313ef2409f3455615a00993f2
diff --git a/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el b/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el
new file mode 100644
index 000000000000..2db51796990b
--- /dev/null
+++ b/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el
@@ -0,0 +1,4 @@
+(eval-after-load "yasnippet"
+ '(let ((snippets-dir "@SITEETC@"))
+ (add-to-list 'yas-snippet-dirs snippets-dir t)
+ (yas-load-directory snippets-dir t)))
diff --git a/app-emacs/yasnippet-snippets/metadata.xml b/app-emacs/yasnippet-snippets/metadata.xml
new file mode 100644
index 000000000000..44fb09a8a871
--- /dev/null
+++ b/app-emacs/yasnippet-snippets/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">AndreaCrotti/yasnippet-snippets</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3.ebuild b/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3.ebuild
new file mode 100644
index 000000000000..693935e3fecf
--- /dev/null
+++ b/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="A collection of yasnippet snippets for many languages"
+HOMEPAGE="https://github.com/AndreaCrotti/yasnippet-snippets"
+SRC_URI="https://github.com/AndreaCrotti/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/yasnippet"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() { :; }
+
+src_install() {
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ insinto "${SITEETC}/${PN}"
+ doins -r snippets/.
+ dodoc README.md
+}
diff --git a/app-emacs/yasnippet/Manifest b/app-emacs/yasnippet/Manifest
new file mode 100644
index 000000000000..cf18862df683
--- /dev/null
+++ b/app-emacs/yasnippet/Manifest
@@ -0,0 +1,4 @@
+AUX 50yasnippet-gentoo-0.13.0.el 221 BLAKE2B 51f86d04a825b5e1cb60019bddac2b0e2d91d735ffafdae497c87413eb0ad88efd969575edfe139ba250d2e2115f1c5a242de61f54031b684f35437e6e868989 SHA512 ace64b43229ee327add5d6ac056b86f7468ffb79569ca55d3692c93fd4b9e847d83fa731c8e54ad2aced5d64ed73c9cfa1fc6d6f9a883356dbb6a39142d9a2fb
+DIST yasnippet-0.13.0.tar.gz 577330 BLAKE2B 21830c0a2e99d7669093c16f527debb4921e96aad006887ec1c7e35da58745721658417f1aec96ea78ba4dc5f3951c857848fce67e6d2ff7f255d4aea5687ab9 SHA512 73b111f72e98c4183764cef08ddfaa861dba49f171f96026b074bf62a7aa5e2d8529f616805ba386dd4157b675da953784d5bcd832d6015ce1b72e9c240988c5
+EBUILD yasnippet-0.13.0.ebuild 1014 BLAKE2B 37db6268c4d6d08820e368c26fc6e488f50da201740e03acdb1aab3885de6163dd0d827dbb70d55ff8baf77ec030ca318f44db111ef862a66d1e5555c01174bb SHA512 64122bd778495c2c8114dffba65a1f556e18594679270996759c6edaff19662711e2482152b0cb8c4d658046aa601fb93115b32b884dc2931e1becb0e23da244
+MISC metadata.xml 519 BLAKE2B ee75758a0efbdb9bba9ade444a083901bd22dff47f20ace413983e446f0857b59ca1dbe9ae37dfb9e8ac9d3135ccdfc56dcab712d419a6946084b970ad673745 SHA512 cec1174ce420c4040c18719881f4bcba872af9a12d30ec3ba2e937374be62583a3a2e40622659e3823b2e0c81ba37fb8188fb58dbb0c09375a082eca20ae1421
diff --git a/app-emacs/yasnippet/files/50yasnippet-gentoo-0.13.0.el b/app-emacs/yasnippet/files/50yasnippet-gentoo-0.13.0.el
new file mode 100644
index 000000000000..e58ee2b29cf3
--- /dev/null
+++ b/app-emacs/yasnippet/files/50yasnippet-gentoo-0.13.0.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'yas-minor-mode "yasnippet" "Toggle YASnippet mode." t)
+(autoload 'yas-global-mode "yasnippet" nil t)
+(autoload 'snippet-mode "yasnippet" "A mode for editing yasnippets" t)
diff --git a/app-emacs/yasnippet/metadata.xml b/app-emacs/yasnippet/metadata.xml
new file mode 100644
index 000000000000..b284b51b5b48
--- /dev/null
+++ b/app-emacs/yasnippet/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ YASnippet is a re-design and re-write of smart-snippet. It is much
+ cleaner and more powerful than smart-snippet.
+</longdescription>
+<stabilize-allarches/>
+<upstream>
+ <remote-id type="github">joaotavora/yasnippet</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/yasnippet/yasnippet-0.13.0.ebuild b/app-emacs/yasnippet/yasnippet-0.13.0.ebuild
new file mode 100644
index 000000000000..e6ba47b23dc4
--- /dev/null
+++ b/app-emacs/yasnippet/yasnippet-0.13.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Yet another snippet extension for Emacs"
+HOMEPAGE="http://joaotavora.github.com/yasnippet/"
+SRC_URI="https://github.com/joaotavora/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+SITEFILE="50${PN}-gentoo-${PV}.el"
+
+src_test() {
+ ${EMACS} ${EMACSFLAGS} -L . -l yasnippet-tests \
+ -f ert-run-tests-batch-and-exit
+}
+
+src_install() {
+ elisp-install ${PN} yasnippet.el{,c} yasnippet-debug.el{,c}
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc CONTRIBUTING.md NEWS README.mdown
+ use doc && dodoc -r doc/*
+
+ DOC_CONTENTS="Add the following to your ~/.emacs to use YASnippet:
+ \n\t(require 'yasnippet)
+ \n\t(yas-global-mode 1)
+ \n\nYASnippet no longer bundles snippets directly. Install the package
+ app-emacs/yasnippet-snippets for a collection of snippets."
+ readme.gentoo_create_doc
+}
diff --git a/app-emacs/yatex-1.76 b/app-emacs/yatex-1.76
deleted file mode 100644
index dcd8956a21d9..000000000000
--- a/app-emacs/yatex-1.76
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Yet Another TeX mode for Emacs
-EAPI=4
-HOMEPAGE=http://www.yatex.org/
-IUSE=l10n_ja
-KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=YaTeX
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.yatex.org/yatex1.76.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0ffa4e9ef854c73a2e5ffb0894a0ee2b
diff --git a/app-emacs/yatex-1.77 b/app-emacs/yatex-1.77
deleted file mode 100644
index 58cc72c814a8..000000000000
--- a/app-emacs/yatex-1.77
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Yet Another TeX mode for Emacs
-EAPI=5
-HOMEPAGE=http://www.yatex.org/
-IUSE=l10n_ja
-KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=YaTeX
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.yatex.org/yatex1.77.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fb901f82baba2cc0be06b0ecaa964fc6
diff --git a/app-emacs/yatex/Manifest b/app-emacs/yatex/Manifest
new file mode 100644
index 000000000000..86ce28f2c5f9
--- /dev/null
+++ b/app-emacs/yatex/Manifest
@@ -0,0 +1,9 @@
+AUX 50yatex-gentoo.el 488 BLAKE2B fcc7c76ee0ace31938ac6e7f438832d53542d2cdd0109ddf9ba59c8cdfe535f1bb5f2d2bf5edeb7247cc8903424f3eb5d4eeac56fe01f2d4665c85936a4736bd SHA512 93a1d45bb228d1ac304fd3652246561a5b7a9d91aa230f0f0d62a9e557f9f61a1dafee900139b7588f3310fdb98fbd71d6347ee45b6527ae27e2095da2a652b5
+AUX yatex-1.76-direntry.patch 1730 BLAKE2B e705e6f7b6a0bc7206aafe33af43f239be54b4203dc3e55e7f8221b3509f474c978165c62f8876633b7052247592ce4584beccce93cfe95b046cdedc48e527b5 SHA512 e7ddb8270e5ece483a5a796b7c5b712059b3093ec1994565400afa6731efe76494cb86163632edde3b3bd167cf78886c216482ab4377c9fd8a969b37a41aee6e
+AUX yatex-1.76-gentoo.patch 668 BLAKE2B 8ddfcc0d7f189462777ddd30ad77e4053230f701fc94448ad6ea0bc0096ba02c911e057b071278eb5c4e3b61151d16e247b4fd38c66b7314a2df82c342a00443 SHA512 dc1bd4d95cec7eb9268560ba78c93a1551f28e0da83d9beb99313e034dfd86044f2971a2dc0ae830e975e78d0a79b951d02378c677eb4d39d5e7f6885e6377cd
+AUX yatex-1.77-texinfo-5.patch 2968 BLAKE2B 834f913dfef0d56e12fe163cdee501fc681b6f33beef5f5757598a9c5703c36619ffaa13ad811dc29a36b5fbcb9c7fd2e797ce8ee07bfa2bd2ddf1df65c2242e SHA512 91b2caf1adcd805fa10d9c0b2576a83fb57f549d64e9ee37b6873cd705ebaecf96853efb265b3f7e42f821f37c79b469ca8507fd1d3470190e04594788b7d8ad
+DIST yatex1.76.tar.gz 357552 BLAKE2B c829cf73d38fd0ea12bd9b831059fabae2d8cf6d7f111762a409770910aefc6f0617979e38ef0fb5c489d92c38c83832cf74e075f68a190c794aa15b5f0a696b SHA512 ff2afea1cb1b7e4bef223c13d4cc6b942b1d555959321e7cb97595dfe7ca3adbc9efa6db7d7d13cdd0bb5aa62eabc1d3383d07635b1dbbe5b15175bf99c4c416
+DIST yatex1.77.tar.gz 356721 BLAKE2B f923bc80ec32ee3d1654f15a99624251604c94af60738ad2f56b237d4385da0951bec32b32f297662540667da2648789a380b433332ce7e10f50f1d016c3b6d0 SHA512 d6b909b540b0966cfcd35a36ad7c9e8d8a821ca668ea9b0a4d1f3267a45397800769dd47ce64f5f8cbda65c274a7f415c8e86b6598a365ea41104684cf9df07f
+EBUILD yatex-1.76.ebuild 1213 BLAKE2B 4e707f3c0c9b17209ebc2546044de5b3ec7266d94227f4e5c06bc5fe1f5a00094af364f7133cb06228498b8cb9d3ba3bf1337c1c3a3e3865b46545e673fdf72b SHA512 bfbcf7cf87bb592e8ed9cdb0c17cc2bdaf31246412e145913e993553b1f7ba69fd24625e0941699abec2b5fdb4111cf548641a900f0d24d934df7ad460c14a86
+EBUILD yatex-1.77.ebuild 1241 BLAKE2B 005fadf3bba18e44aa6483f149ab29c5c643a94168f1a575ec5eed48e5dc948c36c8761317ad723cf367051577fe6bf1a58ac512973e5b1b13ca444a8d3d4fe2 SHA512 f935dd5ca28fb1c1eb6ed7eb4828ee08e2b17ed2c73c84986762f9befeab712f7b186c522a8400c4948899b258080230d802722c6934582eb85952d351d4fdac
+MISC metadata.xml 775 BLAKE2B 1bbb59c7ea19bb7527aa04a2c4f85310ba955a05cb3a03081c76ab3802fe6756bcdc209b45194c29caf3bc0ab429687e3e262e1a120f57d1ede05b01a8580ab2 SHA512 51bcb805b7e9f0669d6c8b213061bd948662a89545921375bd4caf4dae84b2e68332b220992c00b70dae3a1de1cf3605f546295195b01b5366b730adea2196bf
diff --git a/app-emacs/yatex/files/50yatex-gentoo.el b/app-emacs/yatex/files/50yatex-gentoo.el
new file mode 100644
index 000000000000..c57be338abeb
--- /dev/null
+++ b/app-emacs/yatex/files/50yatex-gentoo.el
@@ -0,0 +1,15 @@
+;; YaTeX-mode
+(setq auto-mode-alist
+ (cons (cons "\\.tex$" 'yatex-mode) auto-mode-alist))
+(autoload 'yatex-mode "yatex" "Yet Another LaTeX mode" t)
+
+;; YaHtml-mode
+(setq auto-mode-alist
+ (cons (cons "\\.html$" 'yahtml-mode) auto-mode-alist))
+(autoload 'yahtml-mode "yahtml" "Yet Another HTML mode" t)
+
+;; If your Kanji code is EUC-JP, then it is better to add following
+;; lines into .emacs, and it makes file encoding EUC.
+
+(setq YaTeX-kanji-code 3)
+(setq yahtml-kanji-code 3)
diff --git a/app-emacs/yatex/files/yatex-1.76-direntry.patch b/app-emacs/yatex/files/yatex-1.76-direntry.patch
new file mode 100644
index 000000000000..8dc0c5f310f7
--- /dev/null
+++ b/app-emacs/yatex/files/yatex-1.76-direntry.patch
@@ -0,0 +1,60 @@
+--- yatex1.76-orig/docs/yahtmle.tex
++++ yatex1.76/docs/yahtmle.tex
+@@ -1,9 +1,10 @@
+ \def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1
+ \input texinfo
+-@setfilename yahtmle
++@setfilename yahtml.info
+ @settitle Yet Another html-mode for Emacs
++@dircategory Emacs
+ @direntry
+-* yahtml-e: (yahtmle). Yet Another html-mode for Emacs (English).
++* yahtml: (yahtml). Yet Another html-mode for Emacs (English).
+ @end direntry
+
+ @iftex
+--- yatex1.76-orig/docs/yahtmlj.tex
++++ yatex1.76/docs/yahtmlj.tex
+@@ -1,9 +1,10 @@
+ \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1
+ \input texinfo
+-@setfilename yahtmlj
++@setfilename yahtml-ja.info
+ @settitle Yet Another html-mode for Emacs
++@dircategory Emacs
+ @direntry
+-* yahtml: (yahtmlj). Yet Another html-mode for Emacs (Japanese).
++* yahtml-ja: (yahtml-ja). Yet Another html-mode for Emacs (Japanese).
+ @end direntry
+
+ @iftex
+--- yatex1.76-orig/docs/yatexe.tex
++++ yatex1.76/docs/yatexe.tex
+@@ -1,9 +1,10 @@
+ \def\lang{jp} % -*- texinfo -*-
+ \input texinfo.tex
+-@setfilename yatexe
++@setfilename yatex.info
+ @settitle Yet Another tex-mode for Emacs
++@dircategory Emacs
+ @direntry
+-* YaTeX-e: (yatexe). Yet Another tex-mode for Emacs (English).
++* YaTeX: (yatex). Yet Another tex-mode for Emacs (English).
+ @end direntry
+
+ @iftex
+--- yatex1.76-orig/docs/yatexj.tex
++++ yatex1.76/docs/yatexj.tex
+@@ -1,9 +1,10 @@
+ \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1
+ \input texinfo
+-@setfilename yatexj
++@setfilename yatex-ja.info
+ @settitle Yet Another tex-mode for Emacs
++@dircategory Emacs
+ @direntry
+-* YaTeX: (yatexj). Yet Another tex-mode for Emacs (Japanese).
++* YaTeX-ja: (yatex-ja). Yet Another tex-mode for Emacs (Japanese).
+ @end direntry
+
+ @iftex
diff --git a/app-emacs/yatex/files/yatex-1.76-gentoo.patch b/app-emacs/yatex/files/yatex-1.76-gentoo.patch
new file mode 100644
index 000000000000..b961b31798e1
--- /dev/null
+++ b/app-emacs/yatex/files/yatex-1.76-gentoo.patch
@@ -0,0 +1,16 @@
+--- yatex1.73-orig/yatexhlp.el 2006-12-24 07:25:29.000000000 +0100
++++ yatex1.73/yatexhlp.el 2008-05-12 12:19:02.000000000 +0200
+@@ -9,12 +9,7 @@
+ (cond (YaTeX-japan "jp")
+ (t "eng"))))
+ (help-dir
+- (cond
+- ((and (boundp 'site-directory) site-directory) site-directory)
+- ((string-match "\\.app/" doc-directory) ;For Emacs.app(Darwin)
+- (expand-file-name "../site-lisp" doc-directory))
+- (YaTeX-emacs-19 (expand-file-name "../../site-lisp" doc-directory))
+- (t exec-directory))))
++ "/usr/share/emacs/etc/yatex"))
+ (defvar YaTeX-help-file
+ (expand-file-name help-file help-dir)
+ "*Help file of LaTeX/TeX commands or macros.")
diff --git a/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch b/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch
new file mode 100644
index 000000000000..73ff873cce34
--- /dev/null
+++ b/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch
@@ -0,0 +1,86 @@
+--- yatex1.77-orig/docs/yahtmle.tex
++++ yatex1.77/docs/yahtmle.tex
+@@ -1,4 +1,4 @@
+-\def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1
++@c \def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1
+ \input texinfo
+ @setfilename yahtml.info
+ @settitle Yet Another html-mode for Emacs
+--- yatex1.77-orig/docs/yahtmlj.tex
++++ yatex1.77/docs/yahtmlj.tex
+@@ -1,4 +1,4 @@
+-\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1
++@c \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1
+ \input texinfo
+ @setfilename yahtml-ja.info
+ @settitle Yet Another html-mode for Emacs
+--- yatex1.77-orig/docs/yatexe.tex
++++ yatex1.77/docs/yatexe.tex
+@@ -1,4 +1,4 @@
+-\def\lang{jp} % -*- texinfo -*-
++@c \def\lang{jp} % -*- texinfo -*-
+ \input texinfo.tex
+ @setfilename yatex.info
+ @settitle Yet Another tex-mode for Emacs
+@@ -705,7 +705,7 @@
+ @item M-x YaTeX-section-overview
+ @dots{} Generate *Sectioning Lines* buffer
+ @end table
+-@cindex{Generate the listing of sectioning units}
++@cindex Generate the listing of sectioning units
+ from the LaTeX source buffer. In this listing buffer, typing @kbd{u} on
+ the sectioning command shifts up the corresponding sectioning command in
+ source text and @kbd{d} shifts down. After marking lines in the listing
+@@ -1087,7 +1087,7 @@
+ @node Invoking image processor, Jump to main file, Jump to corresponding object, Cursor jump
+ @comment node-name, next, previous, up
+ @section Invoking image processor
+-@cindex{Drawing tool invocation}
++@cindex Drawing tool invocation
+
+ `image-including line' described above means such lines as
+ @code{\epsfile@{file=foo.ps@}}. If you type @kbd{[prefix] g} on that
+@@ -2179,9 +2179,9 @@
+ @table @kbd
+ @item [F]
+ YaTeX:read-position
+-@itemx [A]
++@item [A]
+ Character list which can show up in the brackets
+-@itemx [D]
++@item [D]
+ Return the location specifier such as `[htb]'. When
+ nothing is entered, omit [] itself. If the possible characters
+ are "htbp", call this function as
+@@ -2189,9 +2189,9 @@
+
+ @item [F]
+ YaTeX:read-coordinates
+-@itemx [A]
++@item [A]
+ Base prompt, X-axis prompt, Y-axis prompt (each optional)
+-@itemx [D]
++@item [D]
+ Read the coordinates with the prompt ``BasePrompt X-axisPrompt:'' for
+ X-axis, ``BasePrompt Y-axisPrompt:'' for Y-axis, and return it in the form
+ of ``(X,Y)''. The default prompts are @code{Dimension}, @code{X},
+@@ -2199,9 +2199,9 @@
+
+ @item [F]
+ YaTeX:check-completion-type
+-@itemx [A]
++@item [A]
+ One of the symbols: 'begin, 'section, or 'maketitle
+-@itemx [D]
++@item [D]
+ Check the current completion type is specified one and cause error if
+ not. The variable @code{YaTeX-current-completion-type} holds the symbol
+ according to the current completion type.
+--- yatex1.77-orig/docs/yatexj.tex
++++ yatex1.77/docs/yatexj.tex
+@@ -1,4 +1,4 @@
+-\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1
++@c \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1
+ \input texinfo
+ @setfilename yatex-ja.info
+ @settitle Yet Another tex-mode for Emacs
diff --git a/app-emacs/yatex/metadata.xml b/app-emacs/yatex/metadata.xml
new file mode 100644
index 000000000000..d82c1ecb87c7
--- /dev/null
+++ b/app-emacs/yatex/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
+<longdescription lang="en">
+ YaTeX is an intelligent, acquisitive and integrated package which reduces
+ your efforts of composing LaTeX source on Emacs. And yahtml is the honest
+ and bright YaTeX-compatible major-mode package for writing HTML. If you have
+ noticed the power of YaTeX, you can drive yahtml over the HTML files quickly
+ and steadily. And vice versa, of course.
+</longdescription>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/yatex/yatex-1.76.ebuild b/app-emacs/yatex/yatex-1.76.ebuild
new file mode 100644
index 000000000000..47cd7c4e7d43
--- /dev/null
+++ b/app-emacs/yatex/yatex-1.76.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit elisp eutils
+
+DESCRIPTION="Yet Another TeX mode for Emacs"
+HOMEPAGE="http://www.yatex.org/"
+SRC_URI="http://www.yatex.org/${P/-/}.tar.gz"
+
+KEYWORDS="amd64 ppc ~ppc64 x86"
+SLOT="0"
+LICENSE="YaTeX"
+IUSE="l10n_ja"
+
+S="${WORKDIR}/${P/-/}"
+ELISP_PATCHES="${PN}-1.76-gentoo.patch
+ ${PN}-1.76-direntry.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ # byte-compilation fails (as of 1.74): yatexlib.el requires fonts
+ # that are only available under X
+
+ cd docs
+ makeinfo yatexe.tex yahtmle.tex || die
+
+ if use l10n_ja; then
+ iconv -f WINDOWS-31J -t UTF-8 yatexj.tex >yatex-ja.texi || die
+ iconv -f WINDOWS-31J -t UTF-8 yahtmlj.tex >yahtml-ja.texi || die
+ makeinfo yatex-ja.texi yahtml-ja.texi || die
+ fi
+}
+
+src_install() {
+ elisp-install ${PN} *.el || die
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+ insinto ${SITEETC}/${PN}
+ doins help/YATEXHLP.eng
+ doinfo docs/yatex.info* docs/yahtml.info*
+ dodoc docs/*.eng
+
+ if use l10n_ja; then
+ doins help/YATEXHLP.jp
+ doinfo docs/yatex-ja.info* docs/yahtml-ja.info*
+ dodoc 00readme install docs/{htmlqa,qanda} docs/*.doc
+ fi
+}
diff --git a/app-emacs/yatex/yatex-1.77.ebuild b/app-emacs/yatex/yatex-1.77.ebuild
new file mode 100644
index 000000000000..7b7534cc7785
--- /dev/null
+++ b/app-emacs/yatex/yatex-1.77.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp eutils
+
+DESCRIPTION="Yet Another TeX mode for Emacs"
+HOMEPAGE="http://www.yatex.org/"
+SRC_URI="http://www.yatex.org/${P/-/}.tar.gz"
+
+KEYWORDS="amd64 ppc ~ppc64 x86"
+SLOT="0"
+LICENSE="YaTeX"
+IUSE="l10n_ja"
+
+S="${WORKDIR}/${P/-/}"
+ELISP_PATCHES="${PN}-1.76-gentoo.patch
+ ${PN}-1.76-direntry.patch
+ ${PN}-1.77-texinfo-5.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ # byte-compilation fails (as of 1.74): yatexlib.el requires fonts
+ # that are only available under X
+
+ cd docs
+ makeinfo yatexe.tex yahtmle.tex || die
+
+ if use l10n_ja; then
+ iconv -f WINDOWS-31J -t UTF-8 yatexj.tex >yatex-ja.texi || die
+ iconv -f WINDOWS-31J -t UTF-8 yahtmlj.tex >yahtml-ja.texi || die
+ makeinfo yatex-ja.texi yahtml-ja.texi || die
+ fi
+}
+
+src_install() {
+ elisp-install ${PN} *.el || die
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+ insinto ${SITEETC}/${PN}
+ doins help/YATEXHLP.eng
+ doinfo docs/yatex.info* docs/yahtml.info*
+ dodoc docs/*.eng
+
+ if use l10n_ja; then
+ doins help/YATEXHLP.jp
+ doinfo docs/yatex-ja.info* docs/yahtml-ja.info*
+ dodoc 00readme install docs/{htmlqa,qanda} docs/*.doc
+ fi
+}
diff --git a/app-emacs/yc-4.0.13 b/app-emacs/yc-4.0.13
deleted file mode 100644
index 079a4d0f5c73..000000000000
--- a/app-emacs/yc-4.0.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Yet another Canna client on Emacsen
-EAPI=6
-HOMEPAGE=http://www.ceres.dti.ne.jp/~knak/yc.html
-KEYWORDS=alpha ~amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/canna >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.ceres.dti.ne.jp/~knak/yc-4.0.13.tar.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=446ae9aa76456fa7f49fe9beeb11b86d
diff --git a/app-emacs/yc-5.2.1 b/app-emacs/yc-5.2.1
deleted file mode 100644
index 8d3fcb8b4cb8..000000000000
--- a/app-emacs/yc-5.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Yet another Canna client on Emacsen
-EAPI=6
-HOMEPAGE=http://www.ceres.dti.ne.jp/~knak/yc.html
-KEYWORDS=~alpha ~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-i18n/canna >=virtual/emacs-23
-SLOT=0
-SRC_URI=http://www.ceres.dti.ne.jp/~knak/yc-5.2.1.el.gz
-_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=3f3e22fba959d3df0c008b9bee62491a
diff --git a/app-emacs/yc/Manifest b/app-emacs/yc/Manifest
new file mode 100644
index 000000000000..c378feefec62
--- /dev/null
+++ b/app-emacs/yc/Manifest
@@ -0,0 +1,9 @@
+AUX 50yc-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX sample.dot.emacs 357 BLAKE2B c81dcb247fdafb283e7007720a50e1988c96c0529f2064ea888457bb1530ab4da6411e46143c964713f063dbd4be5b3c858da2c20e0120875dcc1f5102d59fe9 SHA512 c7b40a8d25c3e8d58b8003637e1352fefdfd1f1ed30e9408f9c43bc3a653212fe12a943316900a6ce8fe7b5ab2f7ac7ddc5c749e24326322f2dddbaa07a4a1ca
+AUX sample.hosts.canna 15 BLAKE2B 5fc9ce93ee33d35f21175f285d9c4a4c2cdc6ef17265b33a241457d620ebbaf6185f00a9e3f27838c97748e1b5324d2e6e708b90e9b7199dbeabd4f7b88b18ce SHA512 2b9e6a582e38b11ef99f4530160b476d87d48aed6ab068122bc1f4edd1ece95cbc24eb6e304d0fce9b97b5c2c3e7dce00fe4ab42e386c7971f7a71dd0430a3df
+AUX yc-5.2.1-emacs-26.patch 478 BLAKE2B 0afdbaa3b9996b68efc7697964bd1adfc134899b386ea3e8518ba4a3384c118d645a9b7977e1b76222803b0851dd3b3a0a3afd4505b93494897c186182bab487 SHA512 adc47d253a03939ee986f814fa10cbdbdf01ab036aa0933f90daaaef385577f9ffd5a0740fae3dcae75d6c2e81fab5fe9cc4a9e4a6df1ae5528f476fb8a2e947
+DIST yc-4.0.13.tar.gz 43916 BLAKE2B 7e52c5269b3fbf492d17742aafe242208ba243dadcdd2fb14fbdb4c72765125a39bf7b7c6cd73c50335cc3c64916d0b12814a25f918415d1e20c8e47974f09df SHA512 2b5430766bbdbc77a0ec3aba6d51478ff91186a257e75a2a3af25a885bbddbf7180fbdf3b0876c1a65c149060bb754a44f77bb399c43cc666bd0add40226ca32
+DIST yc-5.2.1.el.gz 33305 BLAKE2B 8bed47715f49466425afefd036cf562055025564e50ae219e027848104e3851b6cba29f74bcf81487d2494d314a290eabe27e128968dbba9d475562e248a267b SHA512 11c8d63a9f6cb94118a00976518949ab50496f8b8f994a8e1c352be5deefc549540935e0727b036c2b3c493366cfb8c47f040fcc425174b6668ec9f5e8d499dc
+EBUILD yc-4.0.13.ebuild 1275 BLAKE2B 140c58c881aee7637a1d778f26d39fb0c71767346bc7a15435ddaa4c9525c43d35b22857c544b9a39e3ac74234b86dad0a069f2e6a45c77d3dc104fc32cf157f SHA512 ede2389ff8b7def3eb9024133f27d72718333f8407c8d2c7837fd03c6338010041e70ba9587a0c5748c92449cb9f419732118d928c84465cdf7ea1489ecd4ad1
+EBUILD yc-5.2.1.ebuild 1151 BLAKE2B 8b9cdc8ba30743bdcd1088f882e717cfe607c87dc638f60d606ea17231c2875a543197487aad5140cb002a4590ea776956b1207421ccbb5fc8c4b63d29713ec5 SHA512 08bb6640407064b328815fd59e13a16647221d0472bf29ab3256ded5abff22ab6f4243a96afffbae6c7e7dfd9cea7f567210281f441e9c14b37920f9c4582a50
+MISC metadata.xml 368 BLAKE2B e63250e7efb1177100aabd30f3552913f47e97bb768b975e3ddd303bb231975de700bdc7cb6cc7c75c7ba3c8a9cef686e636fa001b407b3ed0781b20fba5773b SHA512 d3f3a96a154b437e75f3f7417d009c16b9b7c18e391ed6b9c82503abcb81dca6141e14b531e90411afdc768d7020bdafd44d4865ef68e7a36ac5d6448a940f60
diff --git a/app-emacs/yc/files/50yc-gentoo.el b/app-emacs/yc/files/50yc-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/yc/files/50yc-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/yc/files/sample.dot.emacs b/app-emacs/yc/files/sample.dot.emacs
new file mode 100644
index 000000000000..101532e704a6
--- /dev/null
+++ b/app-emacs/yc/files/sample.dot.emacs
@@ -0,0 +1,12 @@
+;;;; -*- mode: lisp-interaction; syntax: elisp; coding: iso-2022-7bit -*-
+
+;;;; Configuration for yc
+(setq yc-server-host "unix")
+;If you use inet socket service, enable the following line.
+;(setq yc-server-host "localhost")
+(setq yc-use-color t)
+(if (eq window-system 'x)
+ (setq yc-use-fence nil)
+ (setq yc-use-fence t))
+(load "yc")
+(global-yc-mode 1)
diff --git a/app-emacs/yc/files/sample.hosts.canna b/app-emacs/yc/files/sample.hosts.canna
new file mode 100644
index 000000000000..960d75f5266c
--- /dev/null
+++ b/app-emacs/yc/files/sample.hosts.canna
@@ -0,0 +1,2 @@
+localhost
+unix
diff --git a/app-emacs/yc/files/yc-5.2.1-emacs-26.patch b/app-emacs/yc/files/yc-5.2.1-emacs-26.patch
new file mode 100644
index 000000000000..19925c65c454
--- /dev/null
+++ b/app-emacs/yc/files/yc-5.2.1-emacs-26.patch
@@ -0,0 +1,11 @@
+--- a/yc.el
++++ b/yc.el
+@@ -2071,7 +2071,7 @@
+ ;; 文節を指定しない豺隋什澆諒言瓩丶苳旨となる
+ ;; 読みを萋世靴進言瓩呂修瞭匹澆鬟礇奪轡紊垢鹿粡寂蝟赱齠洲痲筵娼笊が 非nil の豺隋∋慊衒言甍聞澆瞭匹澆鮑鐔垢鹿粡寂蝟赱齠洲痲筵娼粤胚闕└瘢雹關闔瘡鬻瘢雹關闔瘡蝟昭粡竚癈鷭п粐Ь繙祗迚逅誌頸蜿釶蜆笊鹿粡寂蝟赱齠洲痲筵娼蜀蜴艱鴃鬻蝟昭粡竚癈鷭п粐Ь祗頤碯銖續齦闕蜆祗艱碯銖續齦闕蜆笊蝟昭粡竚癈鷭п粐Ь祗頤碯銖續齦闕癇祗艱碯銖續齦闕癇笊蝟昭粡竚癈鷭ц縺筵鞘蜀芍甎瘰隲纃痺鶩續痲癆甌皴瘰隲纃痺鶩續痲癆甌貅碣鈬肅跂閼碓斡幹錫鬲冗鈔纔旭旭旭旭旭握禮竅潟官銀下碣纐貅碣皴釈鱚羹Н竍蜚闥艱鱚絲瘰隲纃痺鶩續痲癆甌貎蜆集碍九羌教鍵恐九鴻井傾銀汲元盖梶衣宴隙究祈鍾韶轣笂祚辣籬迪鹿畩鹿粡寂蝟赱齠洲蔘鉉Ь誓穐誓鹿粡寂蝟赱齠洲痲筵娼据迪纈皷闔就窺唖釿閼蜴臀堝⊃鹿粡寂蝟赱齠洲痲筵娼…話壅佚諛辣籬搜堙∵雕艱銓闖鱧續痲癆甌糘笄鹿粡寂蝟赱齠洲痲筵娼韜芻續痲癆瓲苳纂蝟昭粡竚癈鷭п粐Ь踉詩瘟銓瘟鈬鞳就頏闃繝槇鹿粡寂蝟赱齠洲痲筵娼纃瘟讀苳紫銛轣笂仙緕鎬闥胼踉晒纃瘟讀苳纂蝟昭粡竚癈鷭п粐Ь踉試瘢絋苳伺緕芭桃痺頏闃繝熙踉晒釶辣鹿粡寂蝟赱齠洲痲筵娼瘟銓瘟鈬鬢苳纂蝟昭粡竚癈鷭п粐Ь踉詩瘟銓瘟鈬鞳就頏闃繝槇鹿粡寂蝟赱齠洲痲筵娼纃瘟讀苳祉裨仙緕鎬闥胼踉晒纃瘟讀苳纂蝟昭粡竚癈鷭п粐Ь踉試瘢絋苳暫裨瘢絋苳纂蝟昭粡竚癈鷭п粐Ь踉晒轣蜴蜴纈鹿粡寂蝟赱齠洲痲筵娼諛辣籬鹿粡寂蝟赱齠洲蒹痲Ь粡聿蜚韶轣笂祚凱繧趙韶轣笂祚凱繧趙錫鬲嬢纓蛹迴粤旭挟桓碣蜴粤旭旭旭旭旭旭畍鰻劫挟俺矜錫鬲将粤銛跛錫鬲娼蓿繙洲芍竟鶯瘍絲繞韶轣笂祚凱繧趙翠篏験袈繙偽妓斡俺綛祕羞攻箋盡汲騎甍甕齋箋羌Ь瘰隲纃痺鶩祗堪握嘘碯蛹篌昭蝟昭粡竚癈鷭ц襷樟卯騎声蝟昭粡竚癈鷭п粐Ь關蜃蔗更広屋鰻緕楠籬闔鹿粡寂蝟赱齠洲痲筵娼堤齡鱸碯粤鴉閹蒹燐緕纈瘡跚也竇銖鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼伝佗就侠鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼蜴蒹鱸繻蜩闌竏瘟遶胚釿鷦蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь途智賓塢藁就揣瘤阡蒹秩銕竚蜈銓桃痺黼遐鹿粡寂蝟赱齠洲痲筵娼範妖仭播就蔗痕纈纉絎褓謗瘠祟蔗迪⊆蝟昭粡竚癈鷭п粐Ь卉炙夘就蔗痕纈纉絎褓謗瘠鬯苞⊆蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь秒杜單就俳稔旺鹿粡寂蝟赱齠洲痲筵娼嗅就唖鹿粡寂蝟赱齠洲痲筵娼謀掀碗柘就瘡韆辟挟鞦原⊆蝟昭粡竚癈鷭п粐Ь孑貼□鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼卍登杜捗≡韶姥遲竅銕瓣鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼喇堙読姪就軌侘艱銓闖譬鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼齟窰頏辮癇紲蝟昭粡竚癈鷭п粐Ь黼辿凸素唏墜盟排浴諷肅跂鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼 粤聲蝟昭粡竚癈鷭п粐Ь鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼齟窰竢逅蛹紲蝟昭粡竚癈鷭п粐Ь纃瘠鍛就え續鍛鹿粡寂蝟赱齠洲痲筵娼蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь鱆煢銖跛┤鹿粡寂蝟赱齠洲痲筵娼 繻蜩鞏齟窰蜴齡瘡貅蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь粹砠蜒瘤釶鹿粡寂蝟赱齠洲痲筵娼 粹粹△斌途追哈黶逅跂粹纃痺鵺蓖齡鶤竅銕癬鹿粡寂蝟赱齠洲痲筵娼蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь諛熕闢銖蝟昭粡竚癈鷭п粐Ь繻蜩鞏韜艤竟齡蜴齡鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼 繻閾嚆黶逅跂阡轣笂登凖読戔齟葹鱚閭乳鹿粡寂蝟赱齠洲痲筵娼 繻閾鹿粡寂蝟赱齠洲痲筵娼 繻閾綜膚阨黼鉗粹轣蜴閭諷肬竢銕繝鈑蒹瘤釶纈鬪⊆蝟昭粡竚癈鷭п粐Ь繻閾韭縺黼闔肅鴉葹纈紮鍼闌跫鈑蜴蜴阨轣笂頃鹿粡寂蝟赱齠洲痲筵娼 繻閾續纈鬮蓖齡跫竅跏闢槇鹿粡寂蝟赱齠洲痲筵娼 繻閾鹿粡寂蝟赱齠洲痲筵娼 繻閾膚阨黼鈬粹轣蜴閭諷肬竢銕繝鈑蒹瘤釶纈鬪⊆蝟昭粡竚癈鷭п粐Ь繻閾韭縺黼閼蜀癈闌跫鈑登凖読戔闔罧箝竅銕畉⊆蝟昭粡竚癈鷭п粐Ь繻閾蛋領喪賭崚吽椀墫就鈬槇Ъ蝟昭粡竚癈鷭п粐Ь繻閾鹿粡寂蝟赱齠洲痲筵娼 繻閾綜竰縺侑兎婦續祚蓖齡鶤竅銕甌⊆蝟昭粡竚癈鷭п粐Ь繻閾嚆黶逅跂闢瘤釶登凖読戔齟葹鱚閭乳鹿粡寂蝟赱齠洲痲筵娼蝟昭粡竚癈鷭ц縺筵鞘蜀芍甎瘰隲纃痺鶩祗貴荻窺繧趙韶轣笂祚碯蛹篌碣鈬肅跂閼碓斡幹錫鬲冗鈔纔旭旭旭旭旭握蚊邃衣害外桓碣纐貅碣皴釈鱚羹Н竍蜚闥艱鱚絲瘰隲纃痺鶩祗貴荻窺繧趙翠篏験袈繙偽妓斡俺綛祕羞攻箋盡汲騎甍甕齋箋羌Ь瘰隲纃痺鶩祗貴荻窺繧趙鹿畩鹿粡寂蝟赱齠洲蔘鉉Ь誓穐誓鹿粡寂蝟赱齠洲痲筵娼衷顆鱸艾厩更葦賠銓闖阨鈔癆蜿郤蝟昭粡竚癈鷭п粐Ь蜩蛯繖鈔纈蒹纈逑芭賠鈬鱇偈碎蜒蜒緕黼下蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь双表⊆蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь鉞纈蜚跚齔鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼津喘夘來貧僚續鈿纈瘤釶跚緕闔轣笂緕⊆蝟昭粡竚癈鷭п粐Ь詫登素貼∵雕竇鱚鶤糘藪鈬隴釶覩譬鹿粡寂蝟赱齠洲痲筵娼嘔蓄孀表∵雕竇鱚鶤糘藪鈬隴釶覩傴谺苞⊆蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь秒杜單就俳稔旺鹿粡寂蝟赱齠洲痲筵娼嗅就唖鹿粡寂蝟赱齠洲痲筵娼謀掀碗柘就跟葹瘢箒鞦侠鹿粡寂蝟赱齠洲痲筵娼付單就⊆蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь津佚猟就瘰隲蕷護瘤釶⊆蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь棉嗤瀰壮暖途就傴轣笂峡鞜茴鹿粡寂蝟赱齠洲痲筵娼喇堙読姪就軌侘艱銓闖譬鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼齟窰蜴齡瘡讎蝟昭粡竚癈鷭п粐Ь繻蜩鞏齟窰蜴齡瘡貅蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь粹粹△斌途追哈黶逅跂粹纃痺鵺蓖齡鶤竅銕癬鹿粡寂蝟赱齠洲痲筵娼蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь諛熕闢銖蝟昭粡竚癈鷭п粐Ь繻蜩鞏韜艤竟齡蜴齡鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼 繻閾嚆黶逅跂阡轣笂登凖読戔齟葹鱚閭乳鹿粡寂蝟赱齠洲痲筵娼 繻閾鹿粡寂蝟赱齠洲痲筵娼 繻閾綜膚阨黼鉗粹轣蜴閭諷肬竢銕繝鈑蒹瘤釶纈鬪⊆蝟昭粡竚癈鷭п粐Ь繻閾韭縺黼闔肅鴉葹纈紮鍼闌跫鈑蜴蜴阨轣笂頃鹿粡寂蝟赱齠洲痲筵娼 繻閾續纈鬮蓖齡跫竅跏闢槇鹿粡寂蝟赱齠洲痲筵娼 繻閾鹿粡寂蝟赱齠洲痲筵娼 繻閾膚阨黼鈬粹轣蜴閭諷肬竢銕繝鈑蒹瘤釶纈鬪⊆蝟昭粡竚癈鷭п粐Ь繻閾韭縺黼閼蜀癈闌跫鈑登凖読戔闔罧箝竅銕畉⊆蝟昭粡竚癈鷭п粐Ь繻閾蛋領喪賭崚吽椀墫就鈬槇Ъ蝟昭粡竚癈鷭п粐Ь繻閾鹿粡寂蝟赱齠洲痲筵娼 繻閾綜竰縺侑兎婦續祚蓖齡鶤竅銕甌⊆蝟昭粡竚癈鷭п粐Ь繻閾嚆黶逅跂闢瘤釶登凖読戔齟葹鱚閭乳鹿粡寂蝟赱齠洲痲筵娼蝟昭粡竚癈鷭ц縺筵鞘蜀芍甎瘰隲纃痺鶩鈞遶屋臼姐扱韶轣笂緕碯鴈葦碓弘啓碣粤跂肅跂閼碓斡幹錫鬲冗鈔纔感祁絛羝井勲旭旭旭旭旭絢碣甎釈鱚羹Н竍蜚闥艱鱚絲瘰隲纃痺鶩鈞遶屋臼姐扱翠篏外畊竅羆鬼崖我渦竅彊卦九奄卦箍羂絣絮顕俄Ь瘰隲纃痺鶩鈞遶屋臼姐扱鹿畩錫鬲娼粤銛跛鹿粡寂蝟赱齠洲蔘鉉Ь誓卯渦穐誓鹿粡寂蝟赱齠洲粤讌将津読療吊佝喪途純闕韈跂闔肅苺鱚銖跛闢銖竟齡鴉鱚鞜鱚續鉋痺觴蝟昭粡竚癈鷭т繻Ь登杜捗瘰隲纃痺鶩竢跫鬮纃叙蜥瘡轣笂骸蝟昭粡竚癈鷭т繻Ь途智賓塢藁准緕碯鴈闌闥蒹辣闥轣笂鹿粡寂蝟赱齠洲粤讌将伝佗輯鹿粡寂蝟赱齠洲粤讌将範妖仭播処雕鼬蜴譎逡謨韶藪闥膀鈞鉋瘍絲頌痕蜚蔘皰竢躁籵鳫站緕碯鴈貅蝟昭粡竚癈鷭т繻Ь度從卍喀瘢箒脅蝟昭粡竚癈鷭т繻Ь秒杜單叔侈鹿粡寂蝟赱齠洲粤讌将卍登杜捗瘰隲纃痺鶩竢跫鬮纃叙蜥瘡轣笂骸蝟昭粡竚癈鷭т繻Ь模埆絢蝟昭粡竚癈鷭т繻Ь卉炙夘渚蜥鳫鮑艱銓闖緕碯鴈葦碓弘勲繻鹿粡寂蝟赱齠洲粤讌将煥竚癈黼黯遵跚齔 渦絣鰍畄乙絣卦畊蓋禝更撃狭過原況 繻蜩隲竢迯闔 桶羇撃峨延綏痰羈厳碓球粐箟咳厳蓋 辮癆竏 香究鯵昂訓羆干厩輝挟甕求贋瘁官甕 纉站 干粐羌瘁聿畄畍箘憾俄羌岩乙甼近掩鹿粡寂蝟赱齠洲粤讌将熏箋濬梓幹訓医宛羞原宴換籵瘋桁咳瘋彊粃鹿粡寂蝟赱齠洲蒹痲Ь粡聿蜚韶轣笂緕碯鴈瘤蜀纉皴瘰隲纃痺鶩鈞遲浴鉗聽齡錫鬲嬢纓蛹迴粤旭挟桓碣蜴粤旭旭旭旭旭旭臆害幹斡恩控錫鬲将粤銛跛錫鬲娼蓿繙洲芍竟鶯瘍絲繞韶轣笂緕碯鴈瘤蜀纉蜆集碍九羌教鍵恐九鴻井傾銀汲元盖梶衣宴隙究祈鍾韶轣笂緕碯鴈瘤蜀纉昭蝟昭粡竚癈鷭ц襷樟卯誓鹿粡寂蝟赱齠洲痲筵娼奏軌鈞遶艱銓闖姥駄阻轍剛粐完狂箘旭筝痳祕怨原贋弘禊痰掩官娯患盍矮梓禧球矮箜欝劫抗粃近蚊羔割箟甕宴幻瘁教甬訓粃奄弦聶球慣眼絛輝究癌御乙街過厳医祿攻宴竊羌帆輝訓恩騎渦怨憾灸輝旭盡鴻狭粤元喝吾梓碍齋盍禪聶慣斡顕険羔矣隙祿抗玩鹸鰻矜桁軌羂金険換恒甍蔚絛矜謂經元号葦羔割官宜飢恰皸繧祕痺聰痰桶鹿粡寂蝟赱齠洲痲筵娼追嘖緕碯鴈葦碓弘勲繻昂駄阻轍恰蓋絽儀禮絨剛軍箋瘁聶桁求晃温蚊渦霞求盥鯵禮芦聽干矼延恒痰屋畊薫梶昂慣扱概癌号扱縺皹弘害翫經痺午街峨聲絨倶蚊圧甍隙箙恒玩係繧粤眼帆輝亀我玩卦掩聲籬羃羇鰻眼傑群過矣掩盞畍羝換慨粭葦羔宴俄激羔騎害吾絽聹姥慣恰扱憾縺甬薫痰慌憶鬼翫球鴻険牡喝軍堰我聿究蚊弘恩盥慌蔚外恐鹿粡寂蝟赱齠洲痲筵娼殿嬋鳴緕碯鴈葦碓弘勲繧趙唄盟謀佳衣晃羇箙祿外掩軌繙鹸高禊竄撃御鬼盂撃聹怨亀蚊慨甕絣皸繙係梶儀昂甕羃完街騎高甦銀渦過鯵盡街橋恩灸綛控慌齋玩厩近籵呉拘祿近蓋激矜慌喩禅渦聲騎經幹官祿羝繧箍竇割恐幻皹羚厩宴金我禧鴻瘋険盡蔚竊傑欝粃聶吾医憶儀鰻抗恒厩甓卸鰍蚊岩況遺甼姐香贋晃箙旭綉禮竇球斡恒狭慌羌盞吟羲蝟昭粡竚癈鷭п粐Ь瓶辣籬迪慨盟謀佳戟割延蔚晃寛羚違鴻絛窿齋盡概祓鬼羆訓姐午弦拘羇袈鴻梓姥祁禪箏感恒究感奄我昂羔輝甼峨眼卦井盡芦弘竇圧換粤鴻窿況牡祿絛聹綛甬籬羝拘喩禅渦掩銀高卸蔚恩絛潟祁羂控臆鍵控妓宴訓郡屋隙倶奄牡矚齋祿盖粤求綏寛高騎恐碓偽甼訓經険籬竅繧甍鯵羈桁宜臼籵潟慣恭喝羈筝井挟飢恐唄經慨下蝟昭粡竚癈鷭ц縺筵鞘蜀芍甎瘰隲纃痺鶩鈞遲肅跂鶩軌鈞遶艱銓闖皴瘰隲纃痺鶩鈞遲肅跂鶩軌鈞遶艱銓闖貅碣鈬肅跂閼碓斡幹錫鬲冗鈔纔旭旭旭旭旭握鹸患害盖葦桓碣纐貅碣皴釈鱚羹Н竍蜚闥艱鱚絲瘰隲纃痺鶩鈞遲肅跂鶩軌鈞遶艱銓闖貎蜆集碍九羌教鍵恐九鴻井傾銀汲元盖梶衣宴隙究祈鍾韶轣笂緕碯鴈蛹纉引緕碯鴈緕鎬繻鹿畩鹿粡寂蝟赱齠洲蔘鉉Ь誓穐声蝟昭粡竚癈鷭п粐Ь痲筬蜩ъ閨筬鞜績不徒瓶仞〒鹿粡寂蝟赱齠洲痲筵娼闌閨с闌闥蒹辣緕碯鴈鈞遐鹿粡寂蝟赱齠洲痲筵娼∧齒辣跚緕鴣蜚瘡痲諷辮阨鈬蝟昭粡竚癈鷭п粐Ь粤聲跚癈鈞с闌闥蒹辣緕碯鴈蝟昭粡竚癈鷭ц縺筵鞘蜀芍甎瘰隲纃痺鶩鈞遲辣籬迪韶轣笂緕碯鴈續痲癆甌貅碣鈬肅跂閼碓斡幹錫鬲冗鈔纔旭旭旭旭旭握絛砌畊籵攻梗碣纐貅碣皴釈鱚羹Н竍蜚闥艱鱚絲瘰隲纃痺鶩鈞遲辣籬迪翠篏験袈繙偽妓斡俺綛祕羞攻箋盡汲騎甍甕齋箋羌Ь瘰隲纃痺鶩鈞遲辣籬迪鹿畩鹿粡寂蝟赱齠洲蔘鉉Ь誓穐誓鹿粡寂蝟赱齠洲痲筵娼据迪纈皷闔就窺唖釿閼蜴臀堝⊃鹿粡寂蝟赱齠洲痲筵娼…話壅佚諛辣籬搜堙∵雕艱銓闖鱧續痲癆甌糘笄鹿粡寂蝟赱齠洲痲筵娼韜芻續痲癆瓲苳纂蝟昭粡竚癈鷭п粐Ь踉詩瘟銓瘟鈬鞳就頏闃繝槇鹿粡寂蝟赱齠洲痲筵娼纃瘟讀苳紫銛轣笂仙緕鎬闥胼踉晒纃瘟讀苳纂蝟昭粡竚癈鷭п粐Ь踉試瘢絋苳伺緕芭桃痺頏闃繝熙踉晒釶辣鹿粡寂蝟赱齠洲痲筵娼瘟銓瘟鈬鬢苳纂蝟昭粡竚癈鷭п粐Ь踉詞闔舮纉竰蜷闔鹿粡寂蝟赱齠洲痲筵娼昴鈞蜩阯闔癈竢跫纃絎縺齷闥阨纖纉鈔鹿粡寂蝟赱齠洲痲筵娼粤皷芬繖諷辮阨鈬闥闔頏閾鱇迯蜴黼齠蜿銖蝟昭粡竚癈鷭п粐Ь踉晒跫鈑粤黹鱸頸蜿遉苳纂蝟昭粡竚癈鷭п粐Ь踉雌砠跚跛癇竏纉苳纂蝟昭粡竚癈鷭п粐Ь踉歯頌縺蹙苳纂蝟昭粡竚癈鷭п粐Ь踉賜纃阡絖蜆綵∝蜚蔘癶籵鳫站緕碯鴈讀踉晒鱚迴筅苳纂蝟昭粡竚癈鷭п粐Ь踉晒齡鱚瘢鹿粡寂蝟赱齠洲痲筵娼諛辣籬鹿粡寂蝟赱齠洲蒹痲Ь粡聿蜚韶轣笂緕碯鴈緕碯鴈葦碓弘勲繧趙韶轣笂緕碯鴈緕碯鴈葦碓弘勲繧趙錫鬲嬢纓蛹迴粤旭挟桓碣蜴粤旭旭旭旭旭旭訓甼宛九羚鰍錫鬲将粤銛跛錫鬲娼蓿繙洲芍竟鶯瘍絲繞韶轣笂緕碯鴈緕碯鴈葦碓弘勲繧趙翠篏験袈繙偽妓斡俺綛祕羞攻箋盡汲騎甍甕齋箋羌Ь瘰隲纃痺鶩鈞遲鈞遶屋臼姐扱碯蛹篌昭蝟昭粡竚癈鷭ц襷樟卯恩声蝟昭粡竚癈鷭п粐Ь關蜃蔗更広屋渦緕楠籬闔鹿粡寂蝟赱齠洲痲筵娼堤齡鱸碯粤鴉閹蒹燐緕纈瘡跚也竇銖鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼伝佗輯鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼蜴蒹鱸繻蜩霄蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь途智賓塢藁就昴鈞竢跫纃肬桃痺鵞鹿粡寂蝟赱齠洲痲筵娼範妖仭播就蔗痕跚鉉蜊韈鱧緕碯鴈鞜艱蝟昭粡竚癈鷭п粐Ь蔗鷓芍闕碣閭覩鈞遶繻⊆蝟昭粡竚癈鷭п粐Ь釶頌蓖胙闕頌縺芍鱚竟鹿粡寂蝟赱齠洲痲筵娼嘔蓄孀表蜥鳫鮑艱銓闖繻⊆蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь秒杜單就俳稔旺鹿粡寂蝟赱齠洲痲筵娼嗅就唖鹿粡寂蝟赱齠洲痲筵娼謀掀碗柘就瘢箒侠鹿粡寂蝟赱齠洲痲筵娼付單就⊆蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь登杜捗≡韶轣笂闌闥蒹辣⊆蝟昭粡竚癈鷭п粐Ь津佚猟就津佚猟鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼喇堙読姪就軌侘艱銓闖譬鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼韜艤竟齡蜴齡┤鹿粡寂蝟赱齠洲痲筵娼 繻蜩隲皷繚緕鹿粡寂蝟赱齠洲痲筵娼 繻閾夬釶碎鈞磔繙癜踉蜴蜚蛛跚黼蜴阨轣笂頃鹿粡寂蝟赱齠洲痲筵娼 繻閾竢跫鬮纃絖鈞遘⊆蝟昭粡竚癈鷭п粐Ь鹿粡寂蝟赱齠洲蒹痲Ь粡聿蜚韶轣笂緕蜥祗荻臼沖魃韶轣笂緕蜥祗荻臼沖魃錫鬲鞘繻續繖蛹迴粤旭挟桓碣蜴粤盒概恭贋祁剛旭旭旭旭旭旭錫鬲将蓿繙洲芍竟鶯瘍絲繞韶轣笂緕蜥祗荻臼沖魃翠篏外畊竅羆鬼崖我渦竅彊卦九奄卦箍羂絣絮顕俄Ь瘰隲纃痺鶩鉗鱆渦閏昭碣纐貅蝟昭粡竚癈鷭ц襷樟声蝟昭粡竚癈鷭т繻Ь兎瀕田瀰帆單喀竢逅蛹竢鈕蜃蜴齡瘡竟齡蜴齡闢頏辮癇黼鞜站鹿粡寂蝟赱齠洲粤讌将津佚猟拾苳蚕鶯豁纃痺鶚桶鹿粡寂蝟赱齠洲粤讌将津喘夘來貧僚胚跛縺鱚黹鱸頸痰跂卉跚緕肬桃痺粡鮗蝟昭粡竚癈鷭т繻Ь双表擬蝟昭粡竚癈鷭т繻Ь詫登素貼蔗痕緕蜥祟闥膀鹿粡寂蝟赱齠洲粤讌将謀掀碗柘潤辟挟原鹿粡寂蝟赱齠洲粤讌将棉壇林貼俳稔黄鹿粡寂蝟赱齠洲粤讌将卍登杜捗叙蜥瘡轣笂骸蝟昭粡竚癈鷭т繻Ь模埆絢蝟昭粡竚癈鷭т繻Ь卉炙夘醇痕緕蜥祟闥膀頤皴鉗鱆緕蜥祗荻臼荻鬯苞鹿粡寂蝟赱齠洲粤讌将煥竚癈黼黯巡纉謾關 奄恩近桁訓干筝禊繝弦邃遺卸干甍昂 繻蜩渦絣鰍畄乙絣卦畊蓋禝更撃狭過原況 繻蜩隲竢迯闔 桶羇撃峨延綏痰羈厳碓球粐箟咳厳蓋 辮癆竏 香究鯵昂訓羆干厩輝挟甕求贋瘁官甕 纉站 干粐羌瘁聿畄畍箘憾俄羌岩乙甼近掩 纒踈 汲吾綏臆宜絨険梓盂碍聽恩禧粤灸矣 踉頏彊桁圧娯甞戟甼籬砌甦宛盞箒延畄峨 逡踉蛹蛯 昂羇薫羈郡羃綛眼竅皸玩我皺延険怨 頏纉纈蛯繙屋隙禧霞痲粭粐聹街甕挟箙傾袈憾 鱚痲辣緕籬飢後医吟幻盍俺禪恰高鰍竇割羃繙 闌竏瘟遶胚釿怨概外潟恭邃薫傑吟慨臆盍換割偽扱 鶚竚縺過井郡甦攻聲霞欝飢禊羈街顕妓盞砌鹿粡寂蝟赱齠洲粤讌将熏箋濬軍厩医臆扱狭羇繖盡姥更矣験患宛亀鹿粡寂蝟赱齠洲蒹痲Ь粡聿蜚韶轣笂緕蜥祚浴鉗聽齡韶轣笂緕蜥祚浴鉗聽齡錫鬲嬢纓蛹迴粤旭挟桓碣蜴粤旭旭旭旭旭旭元絣甓崖訓蚊錫鬲将粤銛跛錫鬲娼蓿繙洲芍竟鶯瘍絲繞韶轣笂緕蜥祚浴鉗聽齡翠篏験袈繙偽妓斡俺綛祕羞攻箋盡汲騎甍甕齋箋羌Ь瘰隲纃痺鶩鉗鱆瘤蜀纉昭蝟昭粡竚癈鷭ц襷樟卯誓鹿粡寂蝟赱齠洲痲筵娼奏軌鉗鱆緕鎬繻駄阻轍盒祕聿慨完嘘箚控矼攻聽九羞聲竇甍盡幹甦甕臆竊鰻慣劫汲幻掩畄籬屋遺畍畊恐箋甬汲畊憾繞畊堰九泣鍵窿瘋娯近絮畊羂原癌高禮繖絛綛汲箙騎聲帆輝井憶恰羃軍矜砌甼扱寛盖甼甦撃遺羚岩呉厳綏軍扱絏姐鯵御皹粭教羃灸絣干九禝恰甦銀矚翫箏禮郡儀甞元姐訓妓抗粐岩鍵係箜害挟衣旭吾絣衣芦絮鹿粡寂蝟赱齠洲痲筵娼追嘖緕蜥祗荻臼荻鬯苞薫控駄阻轍蓋禝戟翫換儀禮羆箙究輝姥箚綏羂袈禝険羞粃矼梓粭薫甕禝竅禮潟盞盍癌矮聽街扱教慌怨羔宴晃更畍羔金箒聶験抗咳桁卸灸祺綉軌鬼訓俄卦香矼祺帆輝蓋宜繧憶痲鍵禪甞峨慣梶卸霞羃皸牡鯵香戟球眼厳甕狂畄怨絏箘患羔係街隙痳矮竇険概呉絣甬衣遺痳恭齋羝羇鰻彊井姐挟乙井籵軌灸繙恩鯵甕恰痺鹿粡寂蝟赱齠洲痲筵娼殿嬋鳴緕蜥祗荻臼沖魃碯蛹更駄阻轍絽吾籬恭潟牡粐絮険嘘祓崖慣矜痰粭絛卦恩恰峨倶祿梓乙軍桁喝禪涯圧延唄邃騎憶欝飢邃撃經畊箙慣号嘘慨屋鰻芦宴箍霞高矼激延玩粤甓甕激畍梓帆輝羚拘眼箘竅蚊午狂鍵嘘呉蚊粭箜甞聰幻筝梓患皺箒禧過吟妓蔚羚激瘁甞彊宜聰崖劫奄姥喝聰箏偽幹怯撃卦皸箜幹午厳竇過堰繝繧絛屋群粐九恭竄繞鹿粡寂蝟赱齠洲痲筵娼揺喘續痲癆甌弘駄阻轍崖箜嘘皹完矣旭羝祁憾掩慨患蚊甼弘欝旭鬼究訓竅騎絨羚卦霞外祿郡羝違怯崖羂箚祺聲過筝剛況金袈香更激怯近狭奄喝九呉芦衣聲羌卦完絏違窿竇帆輝嘘盒羞温霞畍羃午幹桁痳姐盖渦憶欝絛祁羌撃娯井聿涯禮皺竄痰羚激箙經金患倶近撃皺晃盒瘁呉喝金抗姥旭鰍箚羝瘋験慨眼喝攻謂箋宴晃盍籬恩旭鹿粡寂蝟赱齠洲蒹痲Ь粡聿蜚韶轣笂緕蜥祚肅跂鶩軌鉗鱆緕鎬繻韶轣笂緕蜥祚肅跂鶩軌鉗鱆緕鎬繻錫鬲嬢纓蛹迴粤旭挟桓碣蜴粤旭旭旭旭旭旭禝蚊厩遺憶玩錫鬲将粤銛跛錫鬲娼蓿繙洲芍竟鶯瘍絲繞韶轣笂緕蜥祚肅跂鶩軌鉗鱆緕鎬繻翠篏験袈繙偽妓斡俺綛祕羞攻箋盡汲騎甍甕齋箋羌Ь瘰隲纃痺鶩鉗鱆蛹纉引緕蜥祗艱銓闖貅昭蝟昭粡竚癈鷭ц襷樟卯誓鹿粡寂蝟赱齠洲痲筵娼粐鎰跚齡跫痲癆∪喇堙棉嗤摺蝟昭粡竚癈鷭п粐Ь癜跫痲鉗鱆緕蜥磚囈癇昴酩卉鹿粡寂蝟赱齠洲蒹痲Ь粡聿蜚韶轣笂緕蜥祚辣籬迪韶轣笂緕蜥祚辣籬迪錫鬲嬢纓蛹迴粤旭挟桓碣蜴粤旭旭旭旭旭旭皹撃劫峨銀慨錫鬲将粤銛跛錫鬲娼蓿繙洲芍竟鶯瘍絲繞韶轣笂緕蜥祚辣籬迪翠篏験袈繙偽妓斡俺綛祕羞攻箋盡汲騎甍甕齋箋羌Ь瘰隲纃痺鶩鉗鱆續痲癆甌貅昭蝟昭粡竚癈鷭ц襷樟卯厩声蝟昭粡竚癈鷭п粐Ь踉賛鴦蜿扈緕竢粡鈑就孕騰権職苳纂蝟昭粡竚癈鷭п粐Ь踉察掴痴捐韜芻續痲癆噎嘖斗蔗痕緕鎬闥膀糘箝辣籬▽苳纂蝟昭粡竚癈鷭п粐Ь踉諮諛辣籬鹿粡寂蝟赱齠洲痲筵娼轣蜴蜴纈綵鳫裙笏▽苳纂蝟昭粡竚癈鷭п粐Ь踉糸轣蛹芬纃痺鸚艱銓闖鱧轣蛹鹿粡寂蝟赱齠洲痲筵娼釶辣賠銓闖燐轣笂鳫裙笏瘢絋苳纂蝟昭粡竚癈鷭п粐Ь踉晒轣蜴蜴纈鹿粡寂蝟赱齠洲痲筵娼跫鈑粤黹鱸頸蜿遉苳纂蝟昭粡竚癈鷭п粐Ь緕敏蜩讚聽癆繖竰蜷碎敏竚蜈銓闥蒹輿池纔繖蜚闥蝟昭粡竚癈鷭п粐Ь鴣銖瘤腕蒹鱚輿池竟鶯齒站續鶤蜩闕鞜碎燐鹿粡寂蝟赱齠洲痲筵娼桃痺姥瘤痰阮絳鈔跛纈皷闔閹桃痺鶤緕敏蜩鱚囂胄鱚蝟昭粡竚癈鷭п粐Ь緕敏齦韶闥韭蜥黼齠蜿銖黼鞜鱇聽鴦壽纈蜩鹿粡寂蝟赱齠洲痲筵娼鴣粡辣銓癇竢迯瘤齷銓癢闥黼蜚蓍闢黼齠蜿銖碯迴齡黼鮗蝟昭粡竚癈鷭п粐Ь鱚聽鱚釿纉鈔緕皷闔癇蜚瘤竢鈕蜃繖纃痺鶚跚齔酪齡鹿粡寂蝟赱齠洲痲筵娼聽癆纉鱚逅跂辣銓繖蛛閼纔銖蜿銖楠纔瘢韭絳鍛堤鱚笏鹿粡寂蝟赱齠洲痲筵娼柱蜈銓鎰柱蜈銓竅矼釶碎繖纈頸蜿隨鹿粡寂蝟赱齠洲痲筵娼闔舮纉竰蜷闔鹿粡寂蝟赱齠洲痲筵娼齡痰蛹蝴絖瘡赱鱆蒹鶩鹿粡寂蝟赱齠洲痲筵娼諛辣籬鹿粡寂蝟赱齠洲蒹痲Ь粡聿蜚韶轣笂緕蜥祚鉗鱆渦窺繧趙韶轣笂緕蜥祚鉗鱆渦窺繧趙錫鬲嬢纓蛹迴粤旭挟桓碣蜴粤旭旭旭旭旭旭皸齋怯禪郡軌錫鬲将粤銛跛錫鬲娼蓿繙洲芍竟鶯瘍絲繞韶轣笂緕蜥祚鉗鱆渦窺繧趙翠篏験袈繙偽妓斡俺綛祕羞攻箋盡汲騎甍甕齋箋羌Ь瘰隲纃痺鶩鉗鱆緕蜥祗荻臼沖魃碯蛹篌昭蝟昭粡竚癈鷭ц襷樟卯寛声蝟昭粡竚癈鷭п粐Ь關蜃蔗更広屋唄緕楠籬闔鹿粡寂蝟赱齠洲痲筵娼堤齡鱸碯粤鴉閹蒹燐緕纈瘡跚也竇銖鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼伝佗週鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼蜴蒹鱸鱚痲辣緕繻蜩霄蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь途智賓塢藁就胚跛縺鱚黹鱸頸痰跂卉跚緕肬桃痺粡鬆鹿粡寂蝟赱齠洲痲筵娼範妖仭播就蔗痕緕蜥祟闥膀⊆蝟昭粡竚癈鷭п粐Ь卉炙夘就胄雕胄隰鉗鱆鱧緕蜥祚傴癇鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼棉壇林貼侈鹿粡寂蝟赱齠洲痲筵娼嗅就唖鹿粡寂蝟赱齠洲痲筵娼謀掀碗柘就瘢箒侠鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼喇堙読姪就軌侘艱銓闖譬鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼齟窰竢鈕蜃紲蝟昭粡竚癈鷭п粐Ь繝闔逾鳬繝癜黼謗阯關闔鷦蝟昭粡竚癈鷭п粐Ь竢鈕蜃頏繙蝌就登凖読戔齟粡≪闔肅苺鱚瘟跂笄鹿粡寂蝟赱齠洲痲筵娼蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь鱆焜闕韈跂┤鹿粡寂蝟赱齠洲痲筵娼 粤聲蝟昭粡竚癈鷭п粐Ь鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼齟窰蜴齡瘡讎蝟昭粡竚癈鷭п粐Ь繻蜩隲蜴齡瘡侘齟祚繻鱆趁鹿粡寂蝟赱齠洲痲筵娼 繻蜩隲皷蛹絖蜴齡瘡△斌途追哈不兎斌統⊆蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь粹蜴肬閭緕蜥祟蜴肬鹿粡寂蝟赱齠洲痲筵娼 粹粹怠排林堊面砺凖祖妖歪麓蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь邃閭鹿粡寂蝟赱齠洲痲筵娼 粹竕銓粹禺蝟昭粡竚癈鷭п粐Ь粹粹橋峡竢銖韈鱇笙叢伝塚鏑鰐笏竦閭鱆鞳鱇鴦鹿粡寂蝟赱齠洲痲筵娼 黼鴟纈蜩鎰閹鱆阨鬯閹鱆鈔纈鈬蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь掴蓄地淋杜墫就吶聽蒹鈕粹笊辣銓癆蜿瘤篌蝟昭粡竚癈鷭п粐Ь 喇堙棉嗤侘鉗鱆逅跂肬笊齡闕蝴癆蜿蓍銓鶤⊆蝟昭粡竚癈鷭п粐Ь鱚痲辣緕閙竰縺焙閭鹿粡寂蝟赱齠洲痲筵娼蝟昭箴鹿昭痰跂昭蝟次赱齠純闔銓 寂蝟赱齠洲肬阡纈Ь艱鈬鱇磔蓿繙洲蔗鷓芍蚊堪竢躁竍蜚硼障芍鹿畩釈鱚羹ц頌痕蜚竝闕丞蜚貴閏奨屋牡境姐杭姥魂旭絢蝟鹿粡´蜆純芍鹿硼糯鹿蔗迪