diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-util/quilt | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-util/quilt')
-rw-r--r-- | dev-util/quilt/Manifest | 2 | ||||
-rw-r--r-- | dev-util/quilt/files/quilt-0.48-no-graphviz.patch | 34 | ||||
-rw-r--r-- | dev-util/quilt/files/quilt-0.50-no-graphviz.patch | 47 | ||||
-rw-r--r-- | dev-util/quilt/files/quilt-0.63-bash-completion.patch | 17 | ||||
-rw-r--r-- | dev-util/quilt/files/quilt-0.63-no-graphviz.patch | 43 | ||||
-rw-r--r-- | dev-util/quilt/metadata.xml | 9 | ||||
-rw-r--r-- | dev-util/quilt/quilt-0.50.ebuild | 59 | ||||
-rw-r--r-- | dev-util/quilt/quilt-0.63.ebuild | 64 | ||||
-rw-r--r-- | dev-util/quilt/quilt-9999.ebuild | 60 |
9 files changed, 335 insertions, 0 deletions
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest new file mode 100644 index 000000000000..abda92426a20 --- /dev/null +++ b/dev-util/quilt/Manifest @@ -0,0 +1,2 @@ +DIST quilt-0.50.tar.gz 452769 SHA256 fa4579628a98cf94472b36869e74f5cd0cb057d6fd13c1872a53f01c45aba8c3 SHA512 c6258872bc591b35e93ba09cc17b4954696faf391aff71b7789cc8cc58c4c54e51b605896937bd1aa54545eed6bf1e9b70352ad9b643f869154e6953c0340365 WHIRLPOOL d4823f9c1507fc3b29f605df855c53343bc0e0b300617b8203d9422d3fede2e1930ba9390329b3ee484fbeb7dde5535f9938c84ceee63477eb8fc0c705556822 +DIST quilt-0.63.tar.gz 389593 SHA256 2846788221aa8844c54f10239c7cbc5e88031859162bcc285449446c3cfffe52 SHA512 e6d5c601805b664a5586a557799e7b321b6b28f7ccec708f52aa96371c987e5791aa54418c9b89d34154e4967ddfe7a261e37195fd29b6aa529e8fa6e5007c45 WHIRLPOOL 89b72f38d75e479fc8f030398757ab325ab46ff79baa7227fe122c4902d582374971c8c5f562611f0c024e8b56db01858669cd0427338f2368492ff118f31280 diff --git a/dev-util/quilt/files/quilt-0.48-no-graphviz.patch b/dev-util/quilt/files/quilt-0.48-no-graphviz.patch new file mode 100644 index 000000000000..4ae5ba09624e --- /dev/null +++ b/dev-util/quilt/files/quilt-0.48-no-graphviz.patch @@ -0,0 +1,34 @@ +--- Makefile.in.orig 2009-02-24 13:49:47.000000000 -0500 ++++ Makefile.in 2009-02-24 13:50:21.000000000 -0500 +@@ -82,8 +82,7 @@ QUILT := $(QUILT_IN) + SRC += $(QUILT_SRC:%=quilt/%) + DIRT += $(QUILT_IN:%=quilt/%) + +-SCRIPTS_IN := patchfns parse-patch inspect dependency-graph edmail \ +- remove-trailing-ws ++SCRIPTS_IN := patchfns parse-patch inspect edmail remove-trailing-ws + + SCRIPTS_SRC := $(SCRIPTS_IN:%=%.in) + SCRIPTS := $(SCRIPTS_IN) +--- bash_completion.orig 2009-02-24 13:49:52.000000000 -0500 ++++ bash_completion 2009-02-24 13:50:46.000000000 -0500 +@@ -189,19 +189,6 @@ _quilt_completion() + ;; + esac + ;; +- graph) +- case $prev in +- -T) +- COMPREPLY=( $( compgen -W "ps" -- $cur ) ) +- ;; +- --edge-labels) +- COMPREPLY=( $( compgen -W "files" -- $cur ) ) +- ;; +- *) +- COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt applied)" -- $cur ) ) +- ;; +- esac +- ;; + grep) + _longopt grep + COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) ) diff --git a/dev-util/quilt/files/quilt-0.50-no-graphviz.patch b/dev-util/quilt/files/quilt-0.50-no-graphviz.patch new file mode 100644 index 000000000000..04e0d7d3a9a1 --- /dev/null +++ b/dev-util/quilt/files/quilt-0.50-no-graphviz.patch @@ -0,0 +1,47 @@ +Index: b/Makefile.in +=================================================================== +--- a/Makefile.in ++++ b/Makefile.in +@@ -82,8 +82,7 @@ QUILT := $(QUILT_IN) + SRC += $(QUILT_SRC:%=quilt/%) + DIRT += $(QUILT_IN:%=quilt/%) + +-SCRIPTS_IN := patchfns parse-patch inspect dependency-graph edmail \ +- remove-trailing-ws ++SCRIPTS_IN := patchfns parse-patch inspect edmail remove-trailing-ws + + SCRIPTS_SRC := $(SCRIPTS_IN:%=%.in) + SCRIPTS := $(SCRIPTS_IN) +Index: b/bash_completion +=================================================================== +--- a/bash_completion ++++ b/bash_completion +@@ -95,7 +95,7 @@ _quilt_completion() + prev=${COMP_WORDS[COMP_CWORD-1]} + + # quilt sub commands +- cmds='add annotate applied delete diff edit files fold fork graph \ ++ cmds='add annotate applied delete diff edit files fold fork \ + grep header import mail new next patches pop previous push refresh \ + remove rename revert series setup snapshot top unapplied' + +@@ -189,19 +189,6 @@ _quilt_completion() + ;; + esac + ;; +- graph) +- case $prev in +- -T) +- COMPREPLY=( $( compgen -W "ps" -- $cur ) ) +- ;; +- --edge-labels) +- COMPREPLY=( $( compgen -W "files" -- $cur ) ) +- ;; +- *) +- COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt applied 2>/dev/null)" -- $cur ) ) +- ;; +- esac +- ;; + grep) + _longopt grep + COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) ) diff --git a/dev-util/quilt/files/quilt-0.63-bash-completion.patch b/dev-util/quilt/files/quilt-0.63-bash-completion.patch new file mode 100644 index 000000000000..c85caca5c9e1 --- /dev/null +++ b/dev-util/quilt/files/quilt-0.63-bash-completion.patch @@ -0,0 +1,17 @@ +--- bash_completion.orig 2014-10-21 18:15:29.549789267 -0400 ++++ bash_completion 2014-10-21 18:15:38.489789221 -0400 +@@ -11,8 +11,6 @@ + # completion to work then you must set QUILT_PC in your global environment + # (for example in ~/.profile) and not just in your quiltrc file. + +-if type quilt &> /dev/null ; then +- + if ! type _expand &> /dev/null ; then + # This function expands tildes in pathnames + # +@@ -310,5 +308,3 @@ _quilt_completion() + && _quilt_complete_opt="-o filenames" + complete -F _quilt_completion $_quilt_complete_opt quilt + unset -v _quilt_complete_opt +- +-fi diff --git a/dev-util/quilt/files/quilt-0.63-no-graphviz.patch b/dev-util/quilt/files/quilt-0.63-no-graphviz.patch new file mode 100644 index 000000000000..80458120f4f1 --- /dev/null +++ b/dev-util/quilt/files/quilt-0.63-no-graphviz.patch @@ -0,0 +1,43 @@ +--- Makefile.in.orig 2014-10-21 17:08:25.639810130 -0400 ++++ Makefile.in 2014-10-21 17:09:03.269809935 -0400 +@@ -79,8 +79,7 @@ QUILT := $(QUILT_IN) + SRC += $(QUILT_SRC:%=quilt/%) + DIRT += $(QUILT_IN:%=quilt/%) + +-SCRIPTS_IN := patchfns inspect dependency-graph edmail \ +- remove-trailing-ws backup-files ++SCRIPTS_IN := patchfns inspect edmail remove-trailing-ws backup-files + + SCRIPTS_SRC := $(SCRIPTS_IN:%=%.in) + SCRIPTS := $(SCRIPTS_IN) +--- bash_completion.orig 2014-10-21 17:09:08.789809906 -0400 ++++ bash_completion 2014-10-21 17:09:53.189809676 -0400 +@@ -100,7 +100,7 @@ _quilt_completion() + prev=${COMP_WORDS[COMP_CWORD-1]} + + # quilt sub commands +- cmds='add annotate applied delete diff edit files fold fork graph \ ++ cmds='add annotate applied delete diff edit files fold fork \ + grep header import mail new next patches pop previous push refresh \ + remove rename revert series setup snapshot top unapplied' + +@@ -194,19 +194,6 @@ _quilt_completion() + ;; + esac + ;; +- graph) +- case $prev in +- -T) +- COMPREPLY=( $( compgen -W "ps" -- $cur ) ) +- ;; +- --edge-labels) +- COMPREPLY=( $( compgen -W "files" -- $cur ) ) +- ;; +- *) +- COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) ) +- ;; +- esac +- ;; + grep) + _longopt grep + COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) ) diff --git a/dev-util/quilt/metadata.xml b/dev-util/quilt/metadata.xml new file mode 100644 index 000000000000..76c91f263895 --- /dev/null +++ b/dev-util/quilt/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>dev-tools</herd> + <herd>suse</herd> + <maintainer> + <email>mpagano@gentoo.org</email> + </maintainer> +</pkgmetadata> diff --git a/dev-util/quilt/quilt-0.50.ebuild b/dev-util/quilt/quilt-0.50.ebuild new file mode 100644 index 000000000000..d30af4988ccc --- /dev/null +++ b/dev-util/quilt/quilt-0.50.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +inherit bash-completion-r1 eutils + +DESCRIPTION="quilt patch manager" +HOMEPAGE="http://savannah.nongnu.org/projects/quilt" +SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm ppc ppc64 sparc x86" +IUSE="emacs graphviz" + +RDEPEND="sys-apps/ed + dev-util/diffstat + graphviz? ( media-gfx/graphviz ) + >=sys-apps/coreutils-8.5" + +PDEPEND="emacs? ( app-emacs/quilt-el )" + +pkg_setup() { + use graphviz && return 0 + echo + elog "If you intend to use the folding functionality (graphical illustration of the" + elog "patch stack) then you'll need to remerge this package with USE=graphviz." + echo + epause 5 +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # Add support for USE=graphviz + use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch" + + # Some tests are somewhat broken while being run from within portage, work + # fine if you run them manually + rm "${S}"/test/delete.test "${S}"/test/mail.test +} + +src_install() { + emake BUILD_ROOT="${D}" install || die "make install failed" + + rm -rf "${D}"/usr/share/doc/${P} + dodoc AUTHORS TODO quilt.changes doc/README doc/README.MAIL \ + doc/quilt.pdf + + rm -rf "${D}"/etc/bash_completion.d + newbashcomp bash_completion ${PN} + + # Remove the compat symlinks + rm -rf "${D}"/usr/share/quilt/compat + + # Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500 + rm -rf "${D}"/usr/share/emacs +} diff --git a/dev-util/quilt/quilt-0.63.ebuild b/dev-util/quilt/quilt-0.63.ebuild new file mode 100644 index 000000000000..eff6dd45ddb9 --- /dev/null +++ b/dev-util/quilt/quilt-0.63.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit bash-completion-r1 eutils + +DESCRIPTION="quilt patch manager" +HOMEPAGE="http://savannah.nongnu.org/projects/quilt" +SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="emacs graphviz" + +RDEPEND="sys-apps/ed + dev-util/diffstat + graphviz? ( media-gfx/graphviz ) + >=sys-apps/coreutils-8.5" + +PDEPEND="emacs? ( app-emacs/quilt-el )" + +pkg_setup() { + use graphviz && return 0 + echo + elog "If you intend to use the folding functionality (graphical illustration of the" + elog "patch stack) then you'll need to remerge this package with USE=graphviz." + echo +} + +src_unpack() { + unpack ${A} + + # Some tests are somewhat broken while being run from within portage, work + # fine if you run them manually + rm "${S}"/test/delete.test "${S}"/test/mail.test +} + +src_prepare() { + + # Apply bash-competion patch see bug #526294 + epatch "${FILESDIR}/${P}-bash-completion.patch" + + # Add support for USE=graphviz + use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch" +} + +src_install() { + emake BUILD_ROOT="${D}" install || die "make install failed" + + rm -rf "${D}"/usr/share/doc/${P} + dodoc AUTHORS TODO doc/README doc/README.MAIL doc/quilt.pdf + + rm -rf "${D}"/etc/bash_completion.d + newbashcomp bash_completion ${PN} + + # Remove the compat symlinks + rm -rf "${D}"/usr/share/quilt/compat + + # Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500 + rm -rf "${D}"/usr/share/emacs +} diff --git a/dev-util/quilt/quilt-9999.ebuild b/dev-util/quilt/quilt-9999.ebuild new file mode 100644 index 000000000000..cb46e98d94a9 --- /dev/null +++ b/dev-util/quilt/quilt-9999.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +EGIT_REPO_URI="git://git.sv.gnu.org/quilt.git" + +[[ ${PV} == 9999 ]] && inherit git-2 + +inherit bash-completion-r1 eutils + +DESCRIPTION="quilt patch manager" +HOMEPAGE="http://savannah.nongnu.org/projects/quilt" +[[ ${PV} == 9999 ]] || SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +[[ ${PV} == 9999 ]] || \ +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="graphviz" + +RDEPEND=" + dev-util/diffstat + mail-mta/sendmail + sys-apps/ed + >=sys-apps/coreutils-8.5 + graphviz? ( media-gfx/graphviz ) +" + +src_prepare() { + # Add support for USE=graphviz + use graphviz || epatch "${FILESDIR}/${PN}-0.60-no-graphviz.patch" + + # remove failing test, because it fails on root-build + rm -rf test/delete.test +} + +src_install() { + emake BUILD_ROOT="${ED}" install + + rm -rf "${ED}"/usr/share/doc/${P} + dodoc AUTHORS TODO quilt.changes doc/README doc/README.MAIL \ + doc/quilt.pdf + + rm -rf "${ED}"/etc/bash_completion.d + newbashcomp bash_completion ${PN} + + # Remove the compat symlinks + rm -rf "${ED}"/usr/share/quilt/compat + + # Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500 + rm -rf "${ED}"/usr/share/emacs +} + +pkg_postinst() { + if ! has_version app-emacs/quilt-el ; then + elog "If you plan to use quilt with emacs consider installing \"app-emacs/quilt-el\"" + fi +} |