diff options
28 files changed, 188 insertions, 311 deletions
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest index 6bb8ec91754a..22906bad0d16 100644 --- a/app-emacs/eselect-mode/Manifest +++ b/app-emacs/eselect-mode/Manifest @@ -1 +1,2 @@ DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658 +DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58 diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild new file mode 100644 index 000000000000..b342275247a8 --- /dev/null +++ b/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2019 Gentoo Authors +# 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/org-mode/Manifest b/app-emacs/org-mode/Manifest index fbb91cfd357a..063ec5628e0b 100644 --- a/app-emacs/org-mode/Manifest +++ b/app-emacs/org-mode/Manifest @@ -1,3 +1,3 @@ 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 +DIST org-9.2.6.tar.gz 5720665 BLAKE2B 19346696b41c2ab5b66ca58b0e28c4ddfa184a390d39b1edc80536901754ac81a479cfb1ead5aaca6d93c9060fc122bbdfe1307900fbf0fc8cdb8fb7a2b2153c SHA512 8aba98bcd2e8e8d40c90524c7b0fd85526fc64725823a6ba66ef80b8f5f2e7d2b1d3363db2553af6672ded085a0abbf00311e36f02cfc1c2dbb18184df8f34a5 diff --git a/app-emacs/org-mode/org-mode-9.0.4.ebuild b/app-emacs/org-mode/org-mode-9.2.6.ebuild index 4ff2e904df26..9fb4aebaeff2 100644 --- a/app-emacs/org-mode/org-mode-9.0.4.ebuild +++ b/app-emacs/org-mode/org-mode-9.2.6.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 NEED_EMACS=24 inherit elisp readme.gentoo-r1 @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos" IUSE="contrib doc odt-schema" RESTRICT="test" -DEPEND="doc? ( virtual/texi2dvi )" +BDEPEND="doc? ( virtual/texi2dvi )" S="${WORKDIR}/org-${PV}" SITEFILE="50${PN}-gentoo.el" @@ -49,7 +49,7 @@ src_install() { fi elisp-site-file-install "${T}/${SITEFILE}" - dodoc README doc/library-of-babel.org etc/ORG-NEWS + 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, diff --git a/app-emacs/tuareg-mode/Manifest b/app-emacs/tuareg-mode/Manifest index 833e07679e33..499de4b46142 100644 --- a/app-emacs/tuareg-mode/Manifest +++ b/app-emacs/tuareg-mode/Manifest @@ -1,3 +1,3 @@ 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 +DIST tuareg-mode-2.2.0.tar.gz 83392 BLAKE2B eead49dff45bb039abef0ffa8f4b874dd6d3bb36e81791b84e411031b4d714324637f99a0cfc3d4029b47032c61ca45424831a2d837fe5b01fa93383237cb14d SHA512 5f0b470920abd44e5b99e84e817ba678aded3042751b8949884c06f3a928105acbe96a28af3a8a089f6b607f8dd70cba7a669e9a61b906b1dad840c7f88bce12 diff --git a/app-emacs/tuareg-mode/tuareg-mode-2.0.8.ebuild b/app-emacs/tuareg-mode/tuareg-mode-2.2.0.ebuild index c2eb95e0e14e..3481178825af 100644 --- a/app-emacs/tuareg-mode/tuareg-mode-2.0.8.ebuild +++ b/app-emacs/tuareg-mode/tuareg-mode-2.2.0.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 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" +SRC_URI="https://github.com/ocaml/tuareg/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2+" +LICENSE="GPL-2+ GPL-3+ ISC" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" S="${WORKDIR}/tuareg-${PV}" -ELISP_REMOVE="tuareg-pkg.el tuareg-site-file.el" +ELISP_REMOVE="dot-emacs.el" SITEFILE="50${PN}-gentoo.el" -DOCS="README.md" +DOCS="README.md CHANGES.md" diff --git a/app-emacs/xclip/Manifest b/app-emacs/xclip/Manifest index 4594bcd4f34c..1830eeac52cd 100644 --- a/app-emacs/xclip/Manifest +++ b/app-emacs/xclip/Manifest @@ -1 +1,2 @@ DIST xclip-1.3.el.xz 2164 BLAKE2B 739cad92a92732a12ac077fc9749bc883b4386977d4c47e793023811c1e668668277f6e0a6bc7105cb7a1186c0d6b3ab276dfb655478d5a6063882f60fa9a7e6 SHA512 5b51703a365fa3991a97c06734b6baf6473ba672ab2ed572db45330fc6b761258403191079725f8c3e8d72919355a2cadf0c04e31396805718de30474ac08520 +DIST xclip-1.9.el.xz 5120 BLAKE2B a2cdfda709d51d7cb8cc3792d23d97fee5b03d1a1fbcf8dfb7810aa91080b0e4af47854ec1fc9e184055c50590d181639c0da100bf4e0a0d41dd856c2f75269d SHA512 96df6cc4257125876b57f3aba469c78136c2366d045b5be38c1f2d8ba69752e6625ec6deacc25da013da2a1bff54821d2171bab9308b24ab3e49a18c3d39ddbb diff --git a/app-emacs/xclip/xclip-1.9.ebuild b/app-emacs/xclip/xclip-1.9.ebuild new file mode 100644 index 000000000000..8c192847ee8d --- /dev/null +++ b/app-emacs/xclip/xclip-1.9.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit elisp readme.gentoo-r1 + +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-laptop/dispad/metadata.xml b/app-laptop/dispad/metadata.xml index 9e74a51079ce..f7c81b34e092 100644 --- a/app-laptop/dispad/metadata.xml +++ b/app-laptop/dispad/metadata.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>jsbronder@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">BlueDragonX/dispad</remote-id> </upstream> diff --git a/dev-python/sabyenc/metadata.xml b/dev-python/sabyenc/metadata.xml index 664b1a9c9e03..7a38bb900964 100644 --- a/dev-python/sabyenc/metadata.xml +++ b/dev-python/sabyenc/metadata.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>jsbronder@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/dev-python/simplecv/Manifest b/dev-python/simplecv/Manifest deleted file mode 100644 index d265ff743438..000000000000 --- a/dev-python/simplecv/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST simplecv-1.3.tar.gz 42860284 BLAKE2B c94e484d8ff23fb4d2f2832aad9fdf10a2015e9ca9245d51a9c959273b8c003736f8ade34e04e3a400027cb512b1d228466a57e9d03bce106dab0b568d8205bc SHA512 47fa3c0bb41057ae17323aeb68711ef4716c4fe6607162218477af9070a1b1a03a7300f38b2c2a5c54ff69b916267504aeeac7c3108d6a45045a1469a93005b8 diff --git a/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch b/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch deleted file mode 100644 index 58f8639ea064..000000000000 --- a/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 164d39c1be66eb35b02fb7c30f65b5929c9e407d Mon Sep 17 00:00:00 2001 -From: Vijay Mahantesh SM <vijay@vijay.(none)> -Date: Sat, 8 Dec 2012 01:55:24 +0530 -Subject: [PATCH] new support for opencv 2.4.3 added - ---- - SimpleCV/ImageClass.py | 52 ++++++++++++++++++++++++++++++++------------------ - 1 file changed, 33 insertions(+), 19 deletions(-) - -diff --git a/SimpleCV/ImageClass.py b/SimpleCV/ImageClass.py -index a545b50..6fab39a 100644 ---- a/SimpleCV/ImageClass.py -+++ b/SimpleCV/ImageClass.py -@@ -7610,11 +7610,12 @@ class Image: - new_version = 0 - #For OpenCV versions till 2.4.0, cv2.__versions__ are of the form "$Rev: 4557 $" - if not ver.startswith('$Rev:'): -- if int(ver.replace('.','0'))>=20400 : -- new_version = 1 -- if int(ver.replace('.','0'))>=20402 : -- new_version = 2 -- -+ if int(ver.replace('.','0'))>=20400: -+ new_version = 1 -+ if int(ver.replace('.','0'))>=20402: -+ new_version = 2 -+ if int(ver.replace('.','0'))>=20403: -+ new_version = 3 - except: - logger.warning("Can't run Keypoints without OpenCV >= 2.3.0") - return -@@ -7622,11 +7623,11 @@ class Image: - if( forceReset ): - self._mKeyPoints = None - self._mKPDescriptors = None -- -- if( self._mKeyPoints is None or self._mKPFlavor != flavor ): -+ -+ if( not(self._mKeyPoints) or self._mKPFlavor != flavor ): - if ( new_version == 0): - if( flavor == "SURF" ): -- surfer = cv2.SURF(thresh,_extended=highQuality,_upright=1) -+ surfer = cv2.SURF(thresh,_extended=highQuality,_upright=1) - self._mKeyPoints,self._mKPDescriptors = surfer.detect(self.getGrayNumpy(),None,False) - if( len(self._mKPDescriptors) == 0 ): - return None, None -@@ -7659,10 +7660,9 @@ class Image: - self._mKPDescriptors = None - self._mKPFlavor = "STAR" - del starer -- -- -- elif( new_version == 2 and flavor in ["SURF", "FAST"] ): -- if( flavor == "SURF" ): -+ -+ elif( new_version >= 2 and flavor in ["SURF", "FAST"] ): -+ if( flavor == "SURF" and new_version==2): - surfer = cv2.SURF(hessianThreshold=thresh,extended=highQuality,upright=1) - #mask = self.getGrayNumpy() - #mask.fill(255) -@@ -7678,6 +7678,20 @@ class Image: - self._mKPFlavor = "SURF" - del surfer - -+ if( flavor == "SURF" and new_version==3): -+ surfer = cv2.SURF(hessianThreshold=thresh,extended=highQuality,upright=1) -+ self._mKeyPoints,self._mKPDescriptors = surfer.detectAndCompute(self.getGrayNumpy(),None,useProvidedKeypoints = False) -+ if( len(self._mKPDescriptors) == 0 ): -+ return None, None -+ -+ if( highQuality == 1 ): -+ self._mKPDescriptors = self._mKPDescriptors.reshape((-1,128)) -+ else: -+ self._mKPDescriptors = self._mKPDescriptors.reshape((-1,64)) -+ -+ self._mKPFlavor = "SURF" -+ del surfer -+ - elif( flavor == "FAST" ): - faster = cv2.FastFeatureDetector(threshold=int(thresh),nonmaxSuppression=True) - self._mKeyPoints = faster.detect(self.getGrayNumpy()) -@@ -7693,19 +7707,19 @@ class Image: - if( len(self._mKPDescriptors) == 0 ): - return None, None - self._mKPFlavor = flavor -- del FeatureDetector -+ del FeatureDetector - - elif( new_version >= 1 and flavor in ["FAST", "STAR", "MSER", "Dense"] ): - FeatureDetector = cv2.FeatureDetector_create(flavor) - self._mKeyPoints = FeatureDetector.detect(self.getGrayNumpy()) - self._mKPDescriptors = None - self._mKPFlavor = flavor -- del FeatureDetector -- -- else: -- logger.warning("ImageClass.Keypoints: I don't know the method you want to use") -- return None, None -- -+ del FeatureDetector -+ -+ else: -+ logger.warning("ImageClass.Keypoints: I don't know the method you want to use") -+ return None, None -+ - return self._mKeyPoints,self._mKPDescriptors - - def _getFLANNMatches(self,sd,td): --- -1.8.1.5 - diff --git a/dev-python/simplecv/files/remove-failing-test.patch b/dev-python/simplecv/files/remove-failing-test.patch deleted file mode 100644 index 7ee326df02a5..000000000000 --- a/dev-python/simplecv/files/remove-failing-test.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d8abe3346d7aa2b192d384476d5f2c89ca9c70e9 Mon Sep 17 00:00:00 2001 -From: Justin Bronder <jsbronder@gmail.com> -Date: Fri, 14 Jun 2013 20:35:11 -0400 -Subject: [PATCH] remove failing test - -According to the docs, the UserWarning that is raised should not be an -issue. Ignore the failure during testings. ---- - SimpleCV/tests/tests.py | 32 -------------------------------- - 1 file changed, 32 deletions(-) - -diff --git a/SimpleCV/tests/tests.py b/SimpleCV/tests/tests.py -index 94f4fc7..ce442e3 100644 ---- a/SimpleCV/tests/tests.py -+++ b/SimpleCV/tests/tests.py -@@ -1731,38 +1731,6 @@ def test_movement_feature(): - - pass - --def test_keypoint_extraction(): -- try: -- import cv2 -- except: -- pass -- return -- -- img1 = Image("../sampleimages/KeypointTemplate2.png") -- img2 = Image("../sampleimages/KeypointTemplate2.png") -- img3 = Image("../sampleimages/KeypointTemplate2.png") -- -- kp1 = img1.findKeypoints() -- kp2 = img2.findKeypoints(highQuality=True) -- kp3 = img3.findKeypoints(flavor="STAR") -- kp1.draw() -- kp2.draw() -- kp3.draw() -- #TODO: Fix FAST binding -- #~ kp4 = img.findKeypoints(flavor="FAST",min_quality=10) -- if( len(kp1)==190 and -- len(kp2)==190 and -- len(kp3)==37 -- #~ and len(kp4)==521 -- ): -- pass -- else: -- assert False -- results = [img1,img2,img3] -- name_stem = "test_keypoint_extraction" -- perform_diff(results,name_stem,tolerance=3.0) -- -- - def test_keypoint_match(): - try: - import cv2 --- -1.8.1.5 - diff --git a/dev-python/simplecv/metadata.xml b/dev-python/simplecv/metadata.xml deleted file mode 100644 index b317bb249d88..000000000000 --- a/dev-python/simplecv/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>jsbronder@gentoo.org</email> - </maintainer> - <use> - <flag name="shell">Enable the iPython SimpleCV shell</flag> - </use> - <upstream> - <remote-id type="github">sightmachine/SimpleCV</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-python/simplecv/simplecv-1.3.ebuild b/dev-python/simplecv/simplecv-1.3.ebuild deleted file mode 100644 index 146b07ce85cd..000000000000 --- a/dev-python/simplecv/simplecv-1.3.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 vcs-snapshot - -MY_PN=SimpleCV - -DESCRIPTION="Python interface to several powerful open source computer vision libraries" -HOMEPAGE="http://simplecv.org/" -SRC_URI="https://github.com/sightmachine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="shell test" - -DEPEND=" - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -RDEPEND=" - >=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/scipy[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/pygame[${PYTHON_USEDEP}] - shell? ( dev-python/ipython[${PYTHON_USEDEP}] )" - -# 1. FeatureDetector being called with the wrong number of arguments -# 2. Remove test that according to docs shouldn't be an issue -PATCHES=( - "${FILESDIR}"/new-support-for-opencv-2.4.3-added.patch - "${FILESDIR}"/remove-failing-test.patch -) - -src_test() { - cd "${S}/SimpleCV/tests" - nosetests tests.py || die "tests failed" -} - -src_install() { - distutils-r1_src_install - if ! use shell; then - rm -rf "${D}"/usr/bin - fi -} diff --git a/dev-python/yenc/Manifest b/dev-python/yenc/Manifest deleted file mode 100644 index bb0c0bf9d548..000000000000 --- a/dev-python/yenc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST yenc-0.4.0.tar.gz 63156 BLAKE2B 1f33aa66cda2646ac8bfcfd94f9ab904defd3e712ac450a961cc73a56ca2c887eb834f20ade6b9a711110a4c58c42171f4891182175813f317239456eb1e29d1 SHA512 06adf10daa3eb56d1960e48c4a42c432821b8c25fcf6c703560efb9d902dc7619b79509a409f436790506f12f172fe0f0c6c1bf6bff7ab5ce3856b272c62c4d9 diff --git a/dev-python/yenc/files/yenc-remove-cflags.patch b/dev-python/yenc/files/yenc-remove-cflags.patch deleted file mode 100644 index 27721c727db3..000000000000 --- a/dev-python/yenc/files/yenc-remove-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- setup.py 2011-09-06 09:04:33.000000000 +0200 -+++ setup.py.NEW 2012-07-07 15:33:13.295906002 +0200 -@@ -33,7 +33,7 @@ - platforms = ["Unix"], - package_dir = { '': 'lib' }, - py_modules = ["yenc"], -- ext_modules = [Extension("_yenc",["src/_yenc.c"],extra_compile_args=["-O2","-g"])], -+ ext_modules = [Extension("_yenc",["src/_yenc.c"])], - classifiers = [ - "Programming Language :: Python", - "Programming Language :: Python :: 2.5", diff --git a/dev-python/yenc/metadata.xml b/dev-python/yenc/metadata.xml deleted file mode 100644 index 664b1a9c9e03..000000000000 --- a/dev-python/yenc/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>jsbronder@gentoo.org</email> - </maintainer> -</pkgmetadata> diff --git a/dev-python/yenc/yenc-0.4.0-r1.ebuild b/dev-python/yenc/yenc-0.4.0-r1.ebuild deleted file mode 100644 index bd25cb3982c7..000000000000 --- a/dev-python/yenc/yenc-0.4.0-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Module providing raw yEnc encoding/decoding" -HOMEPAGE="http://www.golug.it/yenc.html" -SRC_URI="http://www.golug.it/pub/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -# Remove forced CFLAG on setup.py -PATCHES=( "${FILESDIR}"/${PN}-remove-cflags.patch ) -DOCS=( README TODO CHANGES doc/${PN}-draft.1.3.txt ) - -python_test() { - "${PYTHON}" test/test.py || die "Test failed." -} diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest index 9e07ce682c0d..fd3a99264506 100644 --- a/media-libs/x264/Manifest +++ b/media-libs/x264/Manifest @@ -1 +1,2 @@ DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039 +DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d diff --git a/media-libs/x264/x264-0.0.20190903.ebuild b/media-libs/x264/x264-0.0.20190903.ebuild new file mode 100644 index 000000000000..ee5e6ace2cd2 --- /dev/null +++ b/media-libs/x264/x264-0.0.20190903.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic multilib-minimal toolchain-funcs + +DESCRIPTION="A free library for encoding X264/AVC streams" +HOMEPAGE="https://www.videolan.org/developers/x264.html" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git" +else + MY_P="x264-snapshot-$(ver_cut 3)-2245" + SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + S="${WORKDIR}/${MY_P}" +fi + +SLOT="0/157" # SONAME + +LICENSE="GPL-2" +IUSE="altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads" + +ASM_DEP=">=dev-lang/nasm-2.13" +DEPEND="abi_x86_32? ( ${ASM_DEP} ) + abi_x86_64? ( ${ASM_DEP} ) + opencl? ( dev-lang/perl )" +RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )" + +DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt ) + +multilib_src_configure() { + tc-export CC + local asm_conf="" + + if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !altivec ; }; then + asm_conf=" --disable-asm" + fi + + "${S}/configure" \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --disable-cli \ + --disable-avs \ + --disable-lavf \ + --disable-swscale \ + --disable-ffms \ + --disable-gpac \ + --enable-pic \ + --enable-shared \ + --host="${CHOST}" \ + $(usex interlaced "" "--disable-interlaced") \ + $(usex opencl "" "--disable-opencl") \ + $(usex static-libs "--enable-static" "") \ + $(usex threads "" "--disable-thread") \ + ${asm_conf} || die +} diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest index 9e07ce682c0d..fd3a99264506 100644 --- a/media-video/x264-encoder/Manifest +++ b/media-video/x264-encoder/Manifest @@ -1 +1,2 @@ DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039 +DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild new file mode 100644 index 000000000000..207434fe1c32 --- /dev/null +++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="A free commandline encoder for X264/AVC streams" +HOMEPAGE="https://www.videolan.org/developers/x264.html" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git" + SRC_URI="" +else + MY_P="x264-snapshot-$(ver_cut 3)-2245" + SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads" + +REQUIRED_USE="ffmpegsource? ( ffmpeg )" + +RDEPEND=" + ~media-libs/x264-${PV}[interlaced=,threads=] + ffmpeg? ( + !libav? ( media-video/ffmpeg:= ) + libav? ( media-video/libav:= ) + ) + ffmpegsource? ( media-libs/ffmpegsource ) + mp4? ( >=media-video/gpac-0.5.2:= )" + +ASM_DEP=">=dev-lang/nasm-2.13" +DEPEND="${RDEPEND} + amd64? ( ${ASM_DEP} ) + x86? ( ${ASM_DEP} ) + x86-fbsd? ( ${ASM_DEP} )" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}/gpac.patch" ) + +src_configure() { + tc-export CC + + # let upstream pick the optimization level by default + use custom-cflags || filter-flags -O? + + ./configure \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --system-libx264 \ + --host="${CHOST}" \ + --disable-lsmash \ + $(usex avs "" "--disable-avs") \ + $(usex ffmpeg "" "--disable-lavf --disable-swscale") \ + $(usex ffmpegsource "" "--disable-ffms") \ + $(usex interlaced "" "--disable-interlaced") \ + $(usex mp4 "" "--disable-gpac") \ + $(usex threads "" "--disable-thread") || die + + # this is a nasty workaround for bug #376925 for x264 that also applies + # here, needed because as upstream doesn't like us fiddling with their CFLAGS + if use custom-cflags; then + local cflags + cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')" + cflags="${cflags//$(get-flag O)/}" + cflags="${cflags//-O? /$(get-flag O) }" + cflags="${cflags//-g /}" + sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak + fi +} diff --git a/net-nntp/sabnzbd/metadata.xml b/net-nntp/sabnzbd/metadata.xml index 1bd96f540af7..e00cfb113795 100644 --- a/net-nntp/sabnzbd/metadata.xml +++ b/net-nntp/sabnzbd/metadata.xml @@ -1,9 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>jsbronder@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="7za">Add support for extracting 7za files</flag> <flag name="rar">Add support for extracting rar files</flag> diff --git a/sys-cluster/mpich/metadata.xml b/sys-cluster/mpich/metadata.xml index 6cbe440faf21..6884ae20d36c 100644 --- a/sys-cluster/mpich/metadata.xml +++ b/sys-cluster/mpich/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>jsbronder@gentoo.org</email> - <name>Justin Bronder</name> - </maintainer> - <maintainer type="person"> <email>balaji@mcs.anl.gov</email> <name>Pavan Balaji</name> <description>Upstream Contact</description> diff --git a/sys-cluster/mpich2/metadata.xml b/sys-cluster/mpich2/metadata.xml index d88fa13bcaf8..9c96829dcdf1 100644 --- a/sys-cluster/mpich2/metadata.xml +++ b/sys-cluster/mpich2/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>jsbronder@gentoo.org</email> - <name>Justin Bronder</name> - </maintainer> <maintainer type="project"> <email>cluster@gentoo.org</email> <name>Gentoo Cluster Project</name> diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml index d909acfe0a0a..e319ff476a17 100644 --- a/sys-cluster/openmpi/metadata.xml +++ b/sys-cluster/openmpi/metadata.xml @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>jsbronder@gentoo.org</email> - </maintainer> <maintainer type="project"> <email>cluster@gentoo.org</email> <name>Gentoo Cluster Project</name> diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml index 3c4b9436adf9..1184665eaa7c 100644 --- a/www-client/qutebrowser/metadata.xml +++ b/www-client/qutebrowser/metadata.xml @@ -5,10 +5,6 @@ <email>radhermit@gentoo.org</email> <name>Tim Harder</name> </maintainer> - <maintainer type="person"> - <email>jsbronder@gentoo.org</email> - <name>Justin Bronder</name> - </maintainer> <upstream> <remote-id type="github">qutebrowser/qutebrowser</remote-id> </upstream> |