gentoo resync : 06.08.2019

5 files changed, 54 insertions, 67 deletions

diff --git a/app-emacs/bongo/Manifest b/app-emacs/bongo/Manifest
index f683d36f55f2..1971c13a2d51 100644
--- a/app-emacs/bongo/Manifest
+++ b/app-emacs/bongo/Manifest
@@ -1,7 +1,5 @@
 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-1.1.tar.gz 123552 BLAKE2B 06ee27b9ea77b3227038cd18767d8398e416f43a8cdd0a3ed08831200f2edf42eb1c4ab45d363e289b5a471a4ccd60ccb4efc00d62b225eb589dee96c255d7d5 SHA512 c2a4c4241da3ca432b481f56758958a56f749a25eed345d0f30fe560319fd646712b84751212582c2f4ba410cb8858881150b77166fe919725cc50e3917c98e8
 DIST bongo-mplayer-20070204.tar.bz2 3563 BLAKE2B 684c702da46fedd365f780b165619b20e5da643db7b457cc527017971e18a2b0e843896d28216527adbda1e6e7432ff081a7368b697256ac79f2032b30d97123 SHA512 e503ed7980f011a6fc3fa75d0bb9b1cec1ed49d4fb07da92aad65e3c5096b42cf9eb203a8edbb93f2e7924254e4926e9f3fcf473de877fea130557aefad73ebd
-EBUILD bongo-20110621.ebuild 1155 BLAKE2B f4d555d08f793f1af0585f66d9b2680ea4b2b937ab37028c8f55b5c1965a59d98e97a1514d9f7c5ab4042ec5ce3d626bbb35eb78ada5fe8ce6150e84063e20a6 SHA512 6544d4e41b2359f37d1c3b896ae7993a27f69c7fec6541eddd893804b57ba3908d1519c679335d5b199747bc21415a05d00ede6fc089df26149ac333127b0f35
+EBUILD bongo-1.1.ebuild 1344 BLAKE2B a0715f85f55e17be6615d94fbb64480d907dbe934828def4557e7dbfd20c34326031ef0592c5321d48cfd2073fae87c034d251f714eaa131ef076bd51174ea11 SHA512 024d3dc2064a123f2ebb3628e939b25fd0342b3562a3b2aac1e2690c3dae33dff76c75d47c9147a015583bcc72aa90fdf0b01db9c8b697b6e02cbff7f97a3ee3
 MISC metadata.xml 1729 BLAKE2B b30c20f0fe63c627f79349ff20b07250759f6072c5b6dcfd5075359463b2c6256792e0d42b9ba57348c93947096ec86c60fae7acae3613971fa669505b58cdff SHA512 a8a11da7b2f1ed427d9571ea6259b3b0ed3d99a412bd05e4f01a57b4f5da05f11fb6e6006db1bfc624ed341f198dc8a4bef35ce5237119cee99a6d45687f2048
diff --git a/app-emacs/bongo/bongo-1.1.ebuild b/app-emacs/bongo/bongo-1.1.ebuild
new file mode 100644
index 000000000000..a260dc90ae6e
--- /dev/null
+++ b/app-emacs/bongo/bongo-1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Buffer-oriented media player for Emacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/Bongo"
+SRC_URI="https://github.com/dbrock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	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"
+BDEPEND="${RDEPEND}
+	sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="${PN}.texi"
+DOCS="NEWS README TODO tree-from-tags.rb"
+
+src_unpack() {
+	elisp_src_unpack
+	if use mplayer; then
+		mv ${PN}/bongo-mplayer.el "${S}"/ || die
+	fi
+}
+
+src_compile() {
+	# volume.el calls amixer in global scope, causing a sandbox violation
+	# in /dev/snd/. Work around it by disabling the mixer programs.
+	cat <<-EOF >nomixer.txt || die
+		(setq volume-amixer-program "/bin/false")
+		(setq volume-aumix-program "/bin/false")
+	EOF
+	BYTECOMPFLAGS+=" -l nomixer.txt"
+	elisp_src_compile
+}
+
+src_install() {
+	elisp_src_install
+	insinto "${SITEETC}/${PN}"
+	doins images/*.pbm images/*.png
+}
diff --git a/app-emacs/bongo/bongo-20110621.ebuild b/app-emacs/bongo/bongo-20110621.ebuild
deleted file mode 100644
index 5aa2f60e6c65..000000000000
--- a/app-emacs/bongo/bongo-20110621.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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/bongo-20070619-fix-require.patch b/app-emacs/bongo/files/bongo-20070619-fix-require.patch
deleted file mode 100644
index 6b3e6ff588df..000000000000
--- a/app-emacs/bongo/files/bongo-20070619-fix-require.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 3fa257b97f1c..000000000000
--- a/app-emacs/bongo/files/bongo-20110621-texinfo-5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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