commit: cd3a0b27cd6e363978b1e27b5f8f8eae199715f5 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sat Oct 8 10:41:55 2016 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sat Oct 8 10:41:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd3a0b27
Remove some masked for removal packages dev-python/simpletal/Manifest | 3 -- dev-python/simpletal/metadata.xml | 8 --- dev-python/simpletal/simpletal-4.2-r1.ebuild | 41 ---------------- dev-python/simpletal/simpletal-5.1-r1.ebuild | 41 ---------------- dev-python/simpletal/simpletal-5.2.ebuild | 41 ---------------- profiles/package.mask | 11 ----- sys-block/eject/Manifest | 1 - sys-block/eject/eject-2.1.5-r2.ebuild | 41 ---------------- sys-block/eject/files/eject-2.0.13-xmalloc.patch | 28 ----------- sys-block/eject/files/eject-2.1.4-scsi-rdwr.patch | 21 -------- .../eject/files/eject-2.1.5-handle-spaces.patch | 57 ---------------------- sys-block/eject/files/eject-2.1.5-man-typo.patch | 18 ------- sys-block/eject/files/eject-2.1.5-toggle.patch | 27 ---------- sys-block/eject/metadata.xml | 11 ----- 14 files changed, 349 deletions(-) diff --git a/dev-python/simpletal/Manifest b/dev-python/simpletal/Manifest deleted file mode 100644 index 2015095..00000000 --- a/dev-python/simpletal/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST SimpleTAL-4.2.tar.gz 96011 SHA256 3f2983773382491c981e8f621094be4ea4e202336c96f81f9a1f7305e4b2eb08 SHA512 ce816a9c7c66ffa96da0968cea60d838b7e9ed5608a0eae05c40fbbacddec2ca369944f820237d9c3756cd14552d7957c86f8f3e8067cb944ac86529232aa0c8 WHIRLPOOL 6dd675f113d37209a4d10945c0f7116e3d4b45f31bbdfe4488e17150d3969a27e1cb348c3d0136878bae456de646fa8ab086c78d67b8a49046e0b7261261a484 -DIST SimpleTAL-5.1.tar.gz 90604 SHA256 00118ccf7eb74cb3e536a891a1858ad31a2416f63a85cf61fd538bde4c760057 SHA512 51fc5bcfdb4a5ac06b06d7aca20d13cb964a625d0167cc723e8b7352cf154bcde9f14aff96eaa42a5b299c8439336cd35d8fc8f927ae1352be7e7ca5f12aba52 WHIRLPOOL 25e40138a4e53a6f8a6aaa6d607e082ac8ba428ff8b99336d91c5d10e3a6ae8d203e6a49756c96d5357b8605ad4a6eafc3501403a62dce63127eb3ff8ff485bd -DIST SimpleTAL-5.2.tar.gz 96986 SHA256 ddff80acdebfffc9cb7de2e20761936ea06fcc7cf362678d4b66bd7bbce9e8e2 SHA512 16b46886af50f697e706c6b3f0400707299cfe40a81773fbd094de2f52ca8a87438f3ae7477462d0523570b3e3248d2ad4bb2affd3a7088fc45b1201ed228fbe WHIRLPOOL ea412134f341b572936f0543a944d1d9cae4394be801cf879fdf0859379eb0bc17eda781a62f165e54ce90c511ae7d5dec180f9c718e3ec88fb65fd113c9e284 diff --git a/dev-python/simpletal/metadata.xml b/dev-python/simpletal/metadata.xml deleted file mode 100644 index 9e5274c..00000000 --- a/dev-python/simpletal/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Python</name> -</maintainer> -</pkgmetadata> diff --git a/dev-python/simpletal/simpletal-4.2-r1.ebuild b/dev-python/simpletal/simpletal-4.2-r1.ebuild deleted file mode 100644 index 335cf05..00000000 --- a/dev-python/simpletal/simpletal-4.2-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -MY_PN="SimpleTAL" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Stand alone Python implementation of the Zope TAL, TALES and METAL specs for HTML/XML templates" -HOMEPAGE="http://www.owlfish.com/software/simpleTAL/ https://pypi.python.org/pypi/SimpleTAL"; -SRC_URI="http://www.owlfish.com/software/simpleTAL/downloads/${MY_P}.tar.gz"; - -LICENSE="BSD" -SLOT="4" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE="doc examples" - -DEPEND="dev-python/pyxml[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -python_prepare_all() { - sed -e "s/^TEMP_DIR=.*/TEMP_DIR=os.curdir/" \ - -i tests/TALUtilsTests/TemplateCacheTestCases.py || die - distutils-r1_python_prepare_all -} - -python_test() { - "${PYTHON}" runtests.py || die "tests failed" -} - -python_install_all() { - use doc && local HTML_DOCS=( documentation/html/. ) - use examples && local EXAMPLES=( examples/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/simpletal/simpletal-5.1-r1.ebuild b/dev-python/simpletal/simpletal-5.1-r1.ebuild deleted file mode 100644 index e913afb..00000000 --- a/dev-python/simpletal/simpletal-5.1-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python3_3 ) - -inherit distutils-r1 - -MY_PN="SimpleTAL" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Stand alone Python implementation of the Zope TAL, TALES and METAL specs for HTML/XML templates" -HOMEPAGE="http://www.owlfish.com/software/simpleTAL/ https://pypi.python.org/pypi/SimpleTAL"; -SRC_URI="http://www.owlfish.com/software/simpleTAL/downloads/${MY_P}.tar.gz"; - -LICENSE="BSD" -SLOT="5" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE="doc examples" - -DEPEND="" -RDEPEND="" - -S="${WORKDIR}/${MY_P}" - -python_prepare_all() { - sed -e "s/^TEMP_DIR=.*/TEMP_DIR=os.curdir/" \ - -i tests/TALUtilsTests/TemplateCacheTestCases.py || die - distutils-r1_python_prepare_all -} - -python_test() { - "${PYTHON}" runtests.py || die "tests failed" -} - -python_install_all() { - use doc && local HTML_DOCS=( documentation/html/. ) - use examples && local EXAMPLES=( examples/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/simpletal/simpletal-5.2.ebuild b/dev-python/simpletal/simpletal-5.2.ebuild deleted file mode 100644 index e913afb..00000000 --- a/dev-python/simpletal/simpletal-5.2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python3_3 ) - -inherit distutils-r1 - -MY_PN="SimpleTAL" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Stand alone Python implementation of the Zope TAL, TALES and METAL specs for HTML/XML templates" -HOMEPAGE="http://www.owlfish.com/software/simpleTAL/ https://pypi.python.org/pypi/SimpleTAL"; -SRC_URI="http://www.owlfish.com/software/simpleTAL/downloads/${MY_P}.tar.gz"; - -LICENSE="BSD" -SLOT="5" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE="doc examples" - -DEPEND="" -RDEPEND="" - -S="${WORKDIR}/${MY_P}" - -python_prepare_all() { - sed -e "s/^TEMP_DIR=.*/TEMP_DIR=os.curdir/" \ - -i tests/TALUtilsTests/TemplateCacheTestCases.py || die - distutils-r1_python_prepare_all -} - -python_test() { - "${PYTHON}" runtests.py || die "tests failed" -} - -python_install_all() { - use doc && local HTML_DOCS=( documentation/html/. ) - use examples && local EXAMPLES=( examples/. ) - distutils-r1_python_install_all -} diff --git a/profiles/package.mask b/profiles/package.mask index cf60525..1888864 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -166,22 +166,11 @@ app-misc/subsurface # Breaks samba's nmbd process (bug #592502) =sys-libs/tevent-0.9.30 -# Lars Wendler <[email protected]> (06 Sep 2016) -# Dead upstream since 2013. Superseded by eject from -# sys-apps/util-linux. -# Slated for removal in 30 days. -sys-block/eject - # Mike Gilbert <[email protected]> (03 Sep 2016) # Python 3.3 will be removed from Gentoo in 30 days. # dev-lang/python:3.3 will be available in the python overlay. dev-lang/python:3.3 -# Mike Gilbert <[email protected]> (03 Sep 2016) -# No reverse deps, only supports python3.3. -# Removal in 30 days. -dev-python/simpletal - # Ian Stakenvicius <[email protected]> (31 Aug 2016) # Mask old versions of thunderbird as they are no longer supported, # but we keep them in the repo for now in case there is a need diff --git a/sys-block/eject/Manifest b/sys-block/eject/Manifest deleted file mode 100644 index 08f8b0c..00000000 --- a/sys-block/eject/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST eject-2.1.5.tar.gz 123585 SHA256 ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55 SHA512 9ef1ffe51bfcce7faaae3b3bcfd89fcfe7f4c8b31c767ecd75cf021f93f5196a8369956eda71ae68d156d99aabed23cc76da303878978e64955610560778beec WHIRLPOOL 1603a7f553b652ae22fed68796f17b9162155c26276843f388816693554e2bb148fa9b8b868980ec6b0772daee1d85c4c9f7633a283863ea96ea2fa9654fafd3 diff --git a/sys-block/eject/eject-2.1.5-r2.ebuild b/sys-block/eject/eject-2.1.5-r2.ebuild deleted file mode 100644 index 41f9f09..00000000 --- a/sys-block/eject/eject-2.1.5-r2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" - -inherit eutils - -DESCRIPTION="A command to eject a disc from the CD-ROM drive" -HOMEPAGE="http://eject.sourceforge.net/"; -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="nls" - -DEPEND="nls? ( sys-devel/gettext )" -RDEPEND="" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.0.13-xmalloc.patch - epatch "${FILESDIR}"/${PN}-2.1.4-scsi-rdwr.patch - epatch "${FILESDIR}"/${PN}-2.1.5-handle-spaces.patch #151257 - epatch "${FILESDIR}"/${PN}-2.1.5-man-typo.patch #165248 - epatch "${FILESDIR}"/${PN}-2.1.5-toggle.patch #261880 -} - -src_configure() { - econf \ - $(use_enable nls) -} - -src_install() { - # PREFIX for po/Makefile, which hardcodes a prefix of "$(DESTDIR)/usr" - # it is not used in the other makefiles - emake DESTDIR="${D}" PREFIX="${ED}/usr" install || die - dodoc ChangeLog README PORTING TODO AUTHORS NEWS PROBLEMS -} diff --git a/sys-block/eject/files/eject-2.0.13-xmalloc.patch b/sys-block/eject/files/eject-2.0.13-xmalloc.patch deleted file mode 100644 index f609da1..00000000 --- a/sys-block/eject/files/eject-2.0.13-xmalloc.patch +++ /dev/null @@ -1,28 +0,0 @@ -Make sure the malloc's work. - -http://bugs.gentoo.org/91977 - ---- eject.c -+++ eject.c -@@ -304,2 +304,11 @@ - -+void *xmalloc(size_t size) -+{ -+ void *ret = malloc(size); -+ if (!ret) { -+ fprintf(stderr, _("%s: could not allocate memory\n"), programName); -+ exit(1); -+ } -+ return ret; -+} - -@@ -324,3 +333,3 @@ - -- buf = (char *) malloc(strlen(name)+14); /* to allow for "/dev/cdroms/ + "0" + null */ -+ buf = (char *) xmalloc(strlen(name)+14); /* to allow for "/dev/cdroms/ + "0" + null */ - -@@ -794,3 +803,3 @@ - if (status == 0) { -- result = (char *) malloc(strlen(name) + 25); -+ result = (char *) xmalloc(strlen(name) + 25); - strcpy(result, name); diff --git a/sys-block/eject/files/eject-2.1.4-scsi-rdwr.patch b/sys-block/eject/files/eject-2.1.4-scsi-rdwr.patch deleted file mode 100644 index cd5e497..00000000 --- a/sys-block/eject/files/eject-2.1.4-scsi-rdwr.patch +++ /dev/null @@ -1,21 +0,0 @@ -http://bugs.gentoo.org/116731 - ---- eject-2.0.13/eject.c -+++ eject-2.0.13/eject.c -@@ -657,7 +657,15 @@ - /* Open a device file. */ - static int OpenDevice(const char *fullName) - { -- int fd = open(fullName, O_RDONLY|O_NONBLOCK); -+ int flags = O_NONBLOCK; -+ int fd; -+ -+ if (s_option) -+ flags |= O_RDWR; -+ else -+ flags |= O_RDONLY; -+ -+ fd = open(fullName, flags); - if (fd == -1) { - fprintf(stderr, _("%s: unable to open `%s'\n"), programName, fullName); - exit(1); diff --git a/sys-block/eject/files/eject-2.1.5-handle-spaces.patch b/sys-block/eject/files/eject-2.1.5-handle-spaces.patch deleted file mode 100644 index 692368f..00000000 --- a/sys-block/eject/files/eject-2.1.5-handle-spaces.patch +++ /dev/null @@ -1,57 +0,0 @@ -http://bugs.gentoo.org/151257 - ---- eject.c -+++ eject.c -@@ -370,6 +370,30 @@ static int FileExists(const char *name, - - - /* -+ * Linux mangles spaces in mount points by changing them to an octal string -+ * of '\040'. So lets scan the mount point and fix it up by replacing all -+ * occurrences off '\0##' with the ASCII value of 0##. Requires a writable -+ * string as input as we mangle in place. Some of this was taken from the -+ * util-linux package. -+ */ -+#define octalify(a) ((a) & 7) -+#define tooctal(s) (64*octalify(s[1]) + 8*octalify(s[2]) + octalify(s[3])) -+#define isoctal(a) (((a) & ~7) == '0') -+static char *DeMangleMount(char *s) -+{ -+ char *tmp = s; -+ while ((tmp = strchr(tmp, '\\')) != NULL) { -+ if (isoctal(tmp[1]) && isoctal(tmp[2]) && isoctal(tmp[3])) { -+ tmp[0] = tooctal(tmp); -+ memmove(tmp+1, tmp+4, strlen(tmp)-3); -+ } -+ ++tmp; -+ } -+ return s; -+} -+ -+ -+/* - * Given name, such as foo, see if any of the following exist: - * - * foo (if foo starts with '.' or '/') -@@ -884,8 +908,8 @@ static int MountedDevice(const char *nam - if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) || - ((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) { - FCLOSE(fp); -- *deviceName = strdup(s1); -- *mountName = strdup(s2); -+ *deviceName = DeMangleMount(strdup(s1)); -+ *mountName = DeMangleMount(strdup(s2)); - return 1; - } - } -@@ -928,8 +952,8 @@ static int MountableDevice(const char *n - rc = sscanf(line, "%1023s %1023s", s1, s2); - if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) { - FCLOSE(fp); -- *deviceName = strdup(s1); -- *mountName = strdup(s2); -+ *deviceName = DeMangleMount(strdup(s1)); -+ *mountName = DeMangleMount(strdup(s2)); - return 1; - } - } diff --git a/sys-block/eject/files/eject-2.1.5-man-typo.patch b/sys-block/eject/files/eject-2.1.5-man-typo.patch deleted file mode 100644 index 2fecb74..00000000 --- a/sys-block/eject/files/eject-2.1.5-man-typo.patch +++ /dev/null @@ -1,18 +0,0 @@ -http://bugs.gentoo.org/165248 - -Index: eject.1 -=================================================================== -RCS file: /cvsroot/eject/eject/eject/eject.1,v -retrieving revision 1.5 -diff -u -p -r1.5 eject.1 ---- eject.1 11 Dec 2005 00:21:06 -0000 1.5 -+++ eject.1 4 Feb 2007 23:11:15 -0000 -@@ -145,7 +145,7 @@ also passes the \-n option to umount(1). - .TP 0.5i - .B \-m - This option allows eject to work with device drivers which automatically --mount removable media and therefore must be always mount()ed. -+mount removable media and therefore must be always mount(1)ed. - The option tells eject to not try to unmount the given device, - even if it is mounted according to /etc/mtab or /proc/mounts. - diff --git a/sys-block/eject/files/eject-2.1.5-toggle.patch b/sys-block/eject/files/eject-2.1.5-toggle.patch deleted file mode 100644 index 30a9602..00000000 --- a/sys-block/eject/files/eject-2.1.5-toggle.patch +++ /dev/null @@ -1,27 +0,0 @@ -idea take from opensuse -http://bugs.gentoo.org/261880 - ---- a/eject.c -+++ b/eject.c -@@ -576,6 +576,21 @@ static void ToggleTray(int fd) - - #ifdef CDROMCLOSETRAY - -+ /* Ask the CDROM for info, otherwise fall back to manual */ -+ switch (ioctl(fd, CDROM_DRIVE_STATUS)) { -+ case CDS_TRAY_OPEN: -+ CloseTray(fd); -+ return; -+ -+ case CDS_NO_DISC: -+ case CDS_DISC_OK: -+ if (ioctl(fd, CDROMEJECT, 0) < 0) { -+ perror("ioctl"); -+ exit(1); -+ } -+ return; -+ } -+ - /* Try to open the CDROM tray and measure the time therefor - * needed. In my experience the function needs less than 0.05 - * seconds if the tray was already open, and at least 1.5 seconds diff --git a/sys-block/eject/metadata.xml b/sys-block/eject/metadata.xml deleted file mode 100644 index 44863f8..00000000 --- a/sys-block/eject/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Base System</name> -</maintainer> -<upstream> - <remote-id type="sourceforge">eject</remote-id> -</upstream> -</pkgmetadata>
