diff options
author | Christian Heim <phreak@gentoo.org> | 2006-12-27 15:07:21 +0000 |
---|---|---|
committer | Christian Heim <phreak@gentoo.org> | 2006-12-27 15:07:21 +0000 |
commit | 6b430e599e13c7f178360d32377166c791e9c39b (patch) | |
tree | e3daed4fbc71288e0985f1004deac410b9d599d2 /private | |
parent | Adding missing files. (diff) | |
download | phreak-6b430e599e13c7f178360d32377166c791e9c39b.tar.gz phreak-6b430e599e13c7f178360d32377166c791e9c39b.tar.bz2 phreak-6b430e599e13c7f178360d32377166c791e9c39b.zip |
Fixing the dev-util/quilt ebuilds, dropping Debian patches; fixing the testsuite for 0.45 and 0.46.
svn path=/; revision=171
Diffstat (limited to 'private')
-rw-r--r-- | private/dev-util/quilt/Manifest | 64 | ||||
-rw-r--r-- | private/dev-util/quilt/files/digest-quilt-0.46 | 3 | ||||
-rw-r--r-- | private/dev-util/quilt/files/quilt-0.45-backup-files.patch | 482 | ||||
-rw-r--r-- | private/dev-util/quilt/files/quilt-0.45-fail-on-unmounted-proc.patch | 19 | ||||
-rw-r--r-- | private/dev-util/quilt/files/quilt-0.45-no-graphviz.patch | 21 | ||||
-rw-r--r-- | private/dev-util/quilt/files/quilt-0.45-po-updates.patch | 15 | ||||
-rw-r--r-- | private/dev-util/quilt/files/quilt-0.45-push.patch | 44 | ||||
-rw-r--r-- | private/dev-util/quilt/files/quilt-0.45-quilt.1.patch | 25 | ||||
-rw-r--r-- | private/dev-util/quilt/files/quilt-0.45-series-exists.patch | 22 | ||||
-rw-r--r-- | private/dev-util/quilt/files/quilt-0.45-testsuite.patch | 149 | ||||
-rw-r--r-- | private/dev-util/quilt/files/quilt-0.46-no-graphviz.patch | 45 | ||||
-rw-r--r-- | private/dev-util/quilt/files/quilt-0.46-testsuite.patch | 39 | ||||
-rw-r--r-- | private/dev-util/quilt/quilt-0.45-r1.ebuild | 16 | ||||
-rw-r--r-- | private/dev-util/quilt/quilt-0.46.ebuild | 40 |
14 files changed, 205 insertions, 779 deletions
diff --git a/private/dev-util/quilt/Manifest b/private/dev-util/quilt/Manifest index dd92eed..7fd17ad 100644 --- a/private/dev-util/quilt/Manifest +++ b/private/dev-util/quilt/Manifest @@ -6,51 +6,43 @@ AUX quilt-0.42-prevent-stripping.patch 516 RMD160 134e82f7d19d91e0a252690b98271d MD5 11cc8fa578062cd0578b2d4cb4e69619 files/quilt-0.42-prevent-stripping.patch 516 RMD160 134e82f7d19d91e0a252690b98271dd6040a6e16 files/quilt-0.42-prevent-stripping.patch 516 SHA256 a98a07afeb6fce3db1bc2623403f4eceb9a164ed35f5a4755907d430852fd957 files/quilt-0.42-prevent-stripping.patch 516 -AUX quilt-0.45-backup-files.patch 13572 RMD160 7fa1dc817a5fd27a8b515c08456f553bddeb7269 SHA1 559f07281754f4d1f37bf998d7b3fef7d5c103a3 SHA256 0f43ffecae739fa5a4169da7881769a25050311c43634cd53f0662ee92fa7475 -MD5 4d567e33d7ef770e8c851b2b3b983928 files/quilt-0.45-backup-files.patch 13572 -RMD160 7fa1dc817a5fd27a8b515c08456f553bddeb7269 files/quilt-0.45-backup-files.patch 13572 -SHA256 0f43ffecae739fa5a4169da7881769a25050311c43634cd53f0662ee92fa7475 files/quilt-0.45-backup-files.patch 13572 -AUX quilt-0.45-fail-on-unmounted-proc.patch 699 RMD160 5042d5234b2d8397225d1ff8f2437d4d7ff258a8 SHA1 54897d07a4be12bf7ba4bc5c4a24d583abbd2d26 SHA256 dd3c136134ae8751b460f4c3cf4d4c5fd4d4e9999dce0055a2d3a79808f4d5f5 -MD5 195f9f4d532680d7b0828dabefb1f862 files/quilt-0.45-fail-on-unmounted-proc.patch 699 -RMD160 5042d5234b2d8397225d1ff8f2437d4d7ff258a8 files/quilt-0.45-fail-on-unmounted-proc.patch 699 -SHA256 dd3c136134ae8751b460f4c3cf4d4c5fd4d4e9999dce0055a2d3a79808f4d5f5 files/quilt-0.45-fail-on-unmounted-proc.patch 699 -AUX quilt-0.45-no-graphviz.patch 1492 RMD160 d16c44f7c39003c443550ffbe7ac1725c719c83e SHA1 c00808e3ed2de8df2712ca42c0042ab7c70b4141 SHA256 cb9157b3bb65cda2968a605ba131d9f971ec0d62fa34999722dee6d881493344 -MD5 aa843fe81d457813476621a097335cc9 files/quilt-0.45-no-graphviz.patch 1492 -RMD160 d16c44f7c39003c443550ffbe7ac1725c719c83e files/quilt-0.45-no-graphviz.patch 1492 -SHA256 cb9157b3bb65cda2968a605ba131d9f971ec0d62fa34999722dee6d881493344 files/quilt-0.45-no-graphviz.patch 1492 -AUX quilt-0.45-po-updates.patch 358 RMD160 2ab4bee60c17af31e787b74379e9d018283c7b53 SHA1 fe18f10a3cb59cbfa0b306da8c14805189c42ab6 SHA256 8ff89c8fa973b1b4ee97450fb3a6676906a864f6e88c0fd93798811456a82a68 -MD5 d42596833f91a7e2c7680d0a59308906 files/quilt-0.45-po-updates.patch 358 -RMD160 2ab4bee60c17af31e787b74379e9d018283c7b53 files/quilt-0.45-po-updates.patch 358 -SHA256 8ff89c8fa973b1b4ee97450fb3a6676906a864f6e88c0fd93798811456a82a68 files/quilt-0.45-po-updates.patch 358 -AUX quilt-0.45-push.patch 1424 RMD160 fe718ec57763c9fa900f8cdf2e604043cbaa0dcb SHA1 decef26889e7926edbb11d5a8dc86aa268768f9e SHA256 13b0326ae1ea4e82ae1af51cd859050aa63b3571bda510a02bb42e36428268cc -MD5 431eda94cce5f6e51c8edb35e3cc51b1 files/quilt-0.45-push.patch 1424 -RMD160 fe718ec57763c9fa900f8cdf2e604043cbaa0dcb files/quilt-0.45-push.patch 1424 -SHA256 13b0326ae1ea4e82ae1af51cd859050aa63b3571bda510a02bb42e36428268cc files/quilt-0.45-push.patch 1424 -AUX quilt-0.45-quilt.1.patch 1019 RMD160 6e6d7e4ac15e87dcaa6609d94f3fd581ff0043c9 SHA1 c1c2627f10fa002bc7d4c9bba2a941c8a713b23c SHA256 529e475bf90345e7f1f7536f21bc268df864e86910ad6e148aec9255b91d1a1d -MD5 a58891f42a68bb4ca257f0f5a08ccbe6 files/quilt-0.45-quilt.1.patch 1019 -RMD160 6e6d7e4ac15e87dcaa6609d94f3fd581ff0043c9 files/quilt-0.45-quilt.1.patch 1019 -SHA256 529e475bf90345e7f1f7536f21bc268df864e86910ad6e148aec9255b91d1a1d files/quilt-0.45-quilt.1.patch 1019 -AUX quilt-0.45-series-exists.patch 640 RMD160 e1b4b734667096f2ced45d2614cbbc59e24fee86 SHA1 313261b47754cb2fd43d54110b751e418320a9b6 SHA256 b5c4221c3b1814df222248bba27d39a99f8d193ea850454c9b3a17a78cf30ff4 -MD5 28fa3cd5ecd9c32c27ce341f4852c9a7 files/quilt-0.45-series-exists.patch 640 -RMD160 e1b4b734667096f2ced45d2614cbbc59e24fee86 files/quilt-0.45-series-exists.patch 640 -SHA256 b5c4221c3b1814df222248bba27d39a99f8d193ea850454c9b3a17a78cf30ff4 files/quilt-0.45-series-exists.patch 640 -AUX quilt-0.45-testsuite.patch 3272 RMD160 2007d27fbf9d88627deb68ecd9eac124763be2be SHA1 b7c02b9cb859e447c1e0a1da795d044dc26c4e91 SHA256 3834d58a986962b46551c12a1a09b9f30d76fa4c91b570452ece82b787d6aa8c -MD5 ae92297d6ed5be995e4f0d4d04692c37 files/quilt-0.45-testsuite.patch 3272 -RMD160 2007d27fbf9d88627deb68ecd9eac124763be2be files/quilt-0.45-testsuite.patch 3272 -SHA256 3834d58a986962b46551c12a1a09b9f30d76fa4c91b570452ece82b787d6aa8c files/quilt-0.45-testsuite.patch 3272 +AUX quilt-0.45-no-graphviz.patch 1598 RMD160 48a217ebc3ad4513527293e9d2c7a41af4e0a25a SHA1 bcc4646be996e993b624e85835036a3e6c6cc8d4 SHA256 59a918e0cc46db9bc4cd268963b010dd5eb6e5e1e081bc3d51dffb756b4bd0d4 +MD5 bd857ebe5a0fa42282a73d9958d1ea74 files/quilt-0.45-no-graphviz.patch 1598 +RMD160 48a217ebc3ad4513527293e9d2c7a41af4e0a25a files/quilt-0.45-no-graphviz.patch 1598 +SHA256 59a918e0cc46db9bc4cd268963b010dd5eb6e5e1e081bc3d51dffb756b4bd0d4 files/quilt-0.45-no-graphviz.patch 1598 +AUX quilt-0.45-testsuite.patch 864 RMD160 ba09f78c8f7c87e89390dde0f4564f56e3141288 SHA1 91489da02d8bcff12fedcbe5f8c6ec1f39f60f18 SHA256 476ff9c41a0ecb800ad6e3f4a13ed59f0f5db856fc1d59e059c80443ef5bf4d3 +MD5 f2e2b361ce3e323224483df5460f0d32 files/quilt-0.45-testsuite.patch 864 +RMD160 ba09f78c8f7c87e89390dde0f4564f56e3141288 files/quilt-0.45-testsuite.patch 864 +SHA256 476ff9c41a0ecb800ad6e3f4a13ed59f0f5db856fc1d59e059c80443ef5bf4d3 files/quilt-0.45-testsuite.patch 864 +AUX quilt-0.46-no-graphviz.patch 1598 RMD160 b4c2e0de0309c13f7b17faa375b023b0082650e9 SHA1 3cced5b65d8b7888eddaa698249ce035e75b2909 SHA256 d7858941e34bd101b178594ee00b8092c1ca2fed46b4b089ce014ca4adf17b8a +MD5 c259fa80cd7ca544228ee5497d20a625 files/quilt-0.46-no-graphviz.patch 1598 +RMD160 b4c2e0de0309c13f7b17faa375b023b0082650e9 files/quilt-0.46-no-graphviz.patch 1598 +SHA256 d7858941e34bd101b178594ee00b8092c1ca2fed46b4b089ce014ca4adf17b8a files/quilt-0.46-no-graphviz.patch 1598 +AUX quilt-0.46-testsuite.patch 864 RMD160 ba09f78c8f7c87e89390dde0f4564f56e3141288 SHA1 91489da02d8bcff12fedcbe5f8c6ec1f39f60f18 SHA256 476ff9c41a0ecb800ad6e3f4a13ed59f0f5db856fc1d59e059c80443ef5bf4d3 +MD5 f2e2b361ce3e323224483df5460f0d32 files/quilt-0.46-testsuite.patch 864 +RMD160 ba09f78c8f7c87e89390dde0f4564f56e3141288 files/quilt-0.46-testsuite.patch 864 +SHA256 476ff9c41a0ecb800ad6e3f4a13ed59f0f5db856fc1d59e059c80443ef5bf4d3 files/quilt-0.46-testsuite.patch 864 DIST quilt-0.42.tar.gz 355294 RMD160 f8a2e9fce3e7170f499082f754cc9e2d99023f0b SHA1 0ef01517e21f7798cbbd5fa1937155ed2160a3b2 SHA256 a31f72d390c4abeebbd22ec6b79bed2090677908eeb946d3a1d4aa9c0d81b1fe DIST quilt-0.45.tar.gz 399440 RMD160 d3a7f919a348e3de68b9c805acd4bf15ebbdc747 SHA1 35a08648b7bd9b16383b50f2ebc83caa4de51ad7 SHA256 de7290f334baf631a14d031df304ee94cfb550aa69e7512aa589d21c2381c7d8 +DIST quilt-0.46.tar.gz 403984 RMD160 508d6b4f8c1283b20acf8a757d4b3dfc3b8a7961 SHA1 9344c1289f262053beb0196645b41ea5d9cda597 SHA256 47bf030565bb462840db694acc183273455714028c74974c5b3a3bd4ad29ad89 EBUILD quilt-0.42-r1.ebuild 1335 RMD160 629c26469099e538e847365d429913c5ef4d1fac SHA1 89c18cfb77fc8c9af7bad7f30f9762be0d963f7b SHA256 473ce9949a779d5affbf8c991c0e1f9acbd7f98c109a26ff661d39126686786e MD5 6ff37cb091d6cebd60c89188823b9d18 quilt-0.42-r1.ebuild 1335 RMD160 629c26469099e538e847365d429913c5ef4d1fac quilt-0.42-r1.ebuild 1335 SHA256 473ce9949a779d5affbf8c991c0e1f9acbd7f98c109a26ff661d39126686786e quilt-0.42-r1.ebuild 1335 -EBUILD quilt-0.45-r1.ebuild 1447 RMD160 0183383636ea72ec7964931c8d9fae63085ef81b SHA1 d990abc3578483585f2c91efb5f5c2920a7e6e3d SHA256 57324554bc6f537e41022569844b4fdb05159bbf573992c51a1ac2a83cfdc2a6 -MD5 6b12589e20f8de5c927a06033a37dec7 quilt-0.45-r1.ebuild 1447 -RMD160 0183383636ea72ec7964931c8d9fae63085ef81b quilt-0.45-r1.ebuild 1447 -SHA256 57324554bc6f537e41022569844b4fdb05159bbf573992c51a1ac2a83cfdc2a6 quilt-0.45-r1.ebuild 1447 +EBUILD quilt-0.45-r1.ebuild 991 RMD160 28162e24c199bdbab7227bb801ea1fe747c0b010 SHA1 48dfe6f8c7a49d2a13a3be64b8e5307011e7faca SHA256 631f2a1f7b5f3a2a1f673b0ad1e1db3d4a849dd92ea35a8ab1b3d7a3ab922a19 +MD5 2818a3d562b2268def9da7f5f4282445 quilt-0.45-r1.ebuild 991 +RMD160 28162e24c199bdbab7227bb801ea1fe747c0b010 quilt-0.45-r1.ebuild 991 +SHA256 631f2a1f7b5f3a2a1f673b0ad1e1db3d4a849dd92ea35a8ab1b3d7a3ab922a19 quilt-0.45-r1.ebuild 991 +EBUILD quilt-0.46.ebuild 991 RMD160 28162e24c199bdbab7227bb801ea1fe747c0b010 SHA1 48dfe6f8c7a49d2a13a3be64b8e5307011e7faca SHA256 631f2a1f7b5f3a2a1f673b0ad1e1db3d4a849dd92ea35a8ab1b3d7a3ab922a19 +MD5 2818a3d562b2268def9da7f5f4282445 quilt-0.46.ebuild 991 +RMD160 28162e24c199bdbab7227bb801ea1fe747c0b010 quilt-0.46.ebuild 991 +SHA256 631f2a1f7b5f3a2a1f673b0ad1e1db3d4a849dd92ea35a8ab1b3d7a3ab922a19 quilt-0.46.ebuild 991 MD5 ede7dbd008c7539c4943fb71ef980488 files/digest-quilt-0.42-r1 232 RMD160 6d51c014c30d5af0049c20f075a457b6fce87390 files/digest-quilt-0.42-r1 232 SHA256 228496d09fc28aa951ad957cd34bea2315b755902d040b62fe386af33f1abf1a files/digest-quilt-0.42-r1 232 MD5 8e252869c78d6d99da5be4f88c9c6340 files/digest-quilt-0.45-r1 232 RMD160 d069f00672027b258f52aa64d199ebe4676bcede files/digest-quilt-0.45-r1 232 SHA256 2b570e6116cc6d6dd78861815a7c15a6b01be64ed04a70f8db9a9577c2b638a8 files/digest-quilt-0.45-r1 232 +MD5 7842f2ac55c0631520a340c64e7a97ea files/digest-quilt-0.46 232 +RMD160 20071dbee2802529b10c101802e09dc9db4edd97 files/digest-quilt-0.46 232 +SHA256 c2b63dd87c22a4eb5c19b91d7e3911e6198da8116bead15361bea197d05c39c5 files/digest-quilt-0.46 232 diff --git a/private/dev-util/quilt/files/digest-quilt-0.46 b/private/dev-util/quilt/files/digest-quilt-0.46 new file mode 100644 index 0000000..b019ec2 --- /dev/null +++ b/private/dev-util/quilt/files/digest-quilt-0.46 @@ -0,0 +1,3 @@ +MD5 4508546d1ed0257ef7c128b6121b7208 quilt-0.46.tar.gz 403984 +RMD160 508d6b4f8c1283b20acf8a757d4b3dfc3b8a7961 quilt-0.46.tar.gz 403984 +SHA256 47bf030565bb462840db694acc183273455714028c74974c5b3a3bd4ad29ad89 quilt-0.46.tar.gz 403984 diff --git a/private/dev-util/quilt/files/quilt-0.45-backup-files.patch b/private/dev-util/quilt/files/quilt-0.45-backup-files.patch deleted file mode 100644 index e16f908..0000000 --- a/private/dev-util/quilt/files/quilt-0.45-backup-files.patch +++ /dev/null @@ -1,482 +0,0 @@ - * Make backup-files a shell script instead of a binary, so we can make - quilt arch: all [Steve Langasek, thanks so much] - (Closes: #363659) - -Upstream status: Submitted 060427 - ---- - Makefile.in | 25 +--- - quilt/add.in | 2 - quilt/pop.in | 4 - quilt/push.in | 2 - quilt/remove.in | 2 - quilt/scripts/backup-files.in | 245 ++++++++++++++++++++++++++++++++++++++++++ - quilt/snapshot.in | 2 - 7 files changed, 257 insertions(+), 25 deletions(-) - -Index: quilt-0.45/Makefile.in -=================================================================== ---- quilt-0.45.orig/Makefile.in 2006-06-16 12:08:28.000000000 +0200 -+++ quilt-0.45/Makefile.in 2006-06-16 12:08:33.000000000 +0200 -@@ -6,7 +6,6 @@ - prefix := @prefix@ - exec_prefix := @exec_prefix@ - bindir := @bindir@ --libdir := @libdir@ - datadir := @datadir@ - docdir := @docdir@ - mandir := $(datadir)/man -@@ -49,11 +48,6 @@ - LIBS := @LIBS@ - EXEEXT := @EXEEXT@ - --LIBOBJS := $(filter $(patsubst lib/%.c,lib/%.o,$(wildcard lib/*.c)), $(patsubst %,lib/%,@LIBOBJS@)) --ifneq ($(LIBOBJS),) --CFLAGS += -Ilib --endif -- - COMPAT_SYMLINKS := @COMPAT_SYMLINKS@ - COMPAT_PROGRAMS := @COMPAT_PROGRAMS@ - -@@ -81,7 +75,7 @@ - DIRT += $(QUILT_IN:%=quilt/%) - - SCRIPTS_IN := patchfns parse-patch inspect dependency-graph edmail \ -- remove-trailing-ws -+ remove-trailing-ws backup-files - - SCRIPTS_SRC := $(SCRIPTS_IN:%=%.in) - SCRIPTS := $(SCRIPTS_IN) -@@ -92,11 +86,6 @@ - SRC += $(wildcard compat/*.in) $(wildcard compat/*.sh) - DIRT += $(patsubst %.in,%,$(wildcard compat/*.in)) $(COMPAT_SYMLINKS:%=compat/%) - --LIB_SRC := backup-files.c --LIB := backup-files$(EXEEXT) --SRC += $(LIB_SRC:%=lib/%) --DIRT += lib/backup-files$(EXEEXT) $(LIB_SRC:%.c=lib/%.o) -- - DOC_IN := README - DOC_SRC := $(DOC_IN:%=doc/%.in) - DOC := $(DOC_IN) -@@ -126,16 +115,13 @@ - # Settings for running the uninstalled version of quilt in the source tree: - PATH := $(CURDIR)/bin:$(CURDIR)/compat:$(PATH) - QUILT_DIR := $(CURDIR)/quilt --QUILT_LIB := $(CURDIR)/lib - QUILTRC := $(CURDIR)/test/test.quiltrc --export QUILT_DIR QUILT_LIB QUILTRC -+export QUILT_DIR QUILTRC - - #----------------------------------------------------------------------- - - all : configure scripts compat $(DOC:%=doc/%) $(MAN1) mofiles - --$(LIB:%=lib/%) :: $(LIBOBJS) -- - ifeq ($(USE_NLS),yes) - mofiles : $(LINGUAS:%=po/%.mo) - else -@@ -149,7 +135,7 @@ - $(MSGMERGE) -o $@ $@ $^ - - scripts : $(BIN:%=bin/%) $(QUILT:%=quilt/%) \ -- $(SCRIPTS:%=quilt/scripts/%) $(LIB:%=lib/%) \ -+ $(SCRIPTS:%=quilt/scripts/%) \ - $(if $(PATCH_WRAPPER),bin/patch-wrapper) - - dist : clean $(PACKAGE)-$(VERSION).tar.gz -@@ -248,8 +234,7 @@ - $(patsubst %.in,%,$(wildcard bin/*.in quilt/*.in quilt/scripts/*.in)) :: Makefile - % :: %.in - @echo "$< -> $@" >&2 -- @$(SED) -e 's:@QUILT_LIB''@:$(libdir)/$(PACKAGE):g' \ -- -e 's:@QUILT_DIR''@:$(datadir)/$(PACKAGE):g' \ -+ @$(SED) -e 's:@QUILT_DIR''@:$(datadir)/$(PACKAGE):g' \ - -e 's:@PERL''@:$(PERL):g' \ - -e 's:@BASH''@:$(BASH):g' \ - -e 's:@PATCH''@:$(PATCH):g' \ -@@ -260,7 +245,7 @@ - $< > $@ - @$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@) - --lib/backup-files.o :: Makefile -+#lib/backup-files.o :: Makefile - - configure : configure.ac aclocal.m4 - autoconf -@@ -312,9 +297,6 @@ - $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch - endif - -- $(INSTALL) -d $(BUILD_ROOT)$(libdir)/$(PACKAGE) -- $(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(libdir)/$(PACKAGE)/ -- - $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ - $(INSTALL) -m 644 doc/README \ - $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ -@@ -349,7 +331,6 @@ - - uninstall :: - rm -rf $(BIN:%=$(BUILD_ROOT)$(bindir)/%) \ -- $(BUILD_ROOT)$(libdir)/$(PACKAGE) \ - $(BUILD_ROOT)$(datadir)/$(PACKAGE) \ - $(patsubst %,$(BUILD_ROOT)$(mandir)/man1/%, \ - $(notdir $(MAN1))) \ -@@ -374,7 +355,7 @@ - - # Include a run-time generated list of dependencies for each test case - test/.depend : Makefile $(TESTS) -- @( printf "%s : bin/quilt quilt/scripts/patchfns $(LIB:%=lib/%) $(COMPAT)\n" $(TESTS); \ -+ @( printf "%s : bin/quilt quilt/scripts/patchfns $(COMPAT)\n" $(TESTS); \ - $(AWK) 'sub(/.*\$$ *quilt /, "") \ - { print FILENAME, ":", "quilt/"$$1}' $(TESTS); \ - $(AWK) 'sub(/.*\<quilt_command /, "") && ($$1 !~ /[^a-z]/) \ -Index: quilt-0.45/quilt/add.in -=================================================================== ---- quilt-0.45.orig/quilt/add.in 2006-06-16 12:08:28.000000000 +0200 -+++ quilt-0.45/quilt/add.in 2006-06-16 12:08:33.000000000 +0200 -@@ -121,7 +121,7 @@ - continue - fi - -- if ! $QUILT_LIB/backup-files -b -s -L -B $QUILT_PC/$patch/ $SUBDIR$file -+ if ! $QUILT_DIR/scripts/backup-files -b -s -L -B $QUILT_PC/$patch/ $SUBDIR$file - then - printf $"Failed to back up file %s\n" "$SUBDIR$file" >&2 - status=1 -Index: quilt-0.45/quilt/pop.in -=================================================================== ---- quilt-0.45.orig/quilt/pop.in 2006-06-16 12:08:28.000000000 +0200 -+++ quilt-0.45/quilt/pop.in 2006-06-16 12:08:33.000000000 +0200 -@@ -167,7 +167,7 @@ - status=0 - else - printf $"Removing patch %s\n" "$(print_patch $patch)" -- $QUILT_LIB/backup-files $silent -r -t -B $QUILT_PC/$patch/ - -+ $QUILT_DIR/scripts/backup-files $silent -r -t -B $QUILT_PC/$patch/ - - status=$? - fi - remove_from_db $patch -@@ -269,7 +269,7 @@ - # of one: This will automatically be the case in the usual - # situations, but we don't want to risk file corruption in weird - # corner cases such as files added to a patch but not modified. -- $QUILT_LIB/backup-files -L -s -B $QUILT_PC/$patch/ - -+ $QUILT_DIR/scripts/backup-files -L -s -B $QUILT_PC/$patch/ - - printf $"Now at patch %s\n" "$(print_patch $patch)" - fi - ### Local Variables: -Index: quilt-0.45/quilt/push.in -=================================================================== ---- quilt-0.45.orig/quilt/push.in 2006-06-16 12:08:28.000000000 +0200 -+++ quilt-0.45/quilt/push.in 2006-06-16 12:08:33.000000000 +0200 -@@ -139,7 +139,7 @@ - { - local patch=$1 - -- $QUILT_LIB/backup-files $silent_unless_verbose -r -B $QUILT_PC/$patch/ - -+ $QUILT_DIR/scripts/backup-files $silent_unless_verbose -r -B $QUILT_PC/$patch/ - - } - - cleanup_patch_output() { -Index: quilt-0.45/quilt/remove.in -=================================================================== ---- quilt-0.45.orig/quilt/remove.in 2006-06-16 12:08:28.000000000 +0200 -+++ quilt-0.45/quilt/remove.in 2006-06-16 12:08:33.000000000 +0200 -@@ -86,7 +86,7 @@ - fi - - # Restore file from backup -- if ! $QUILT_LIB/backup-files -r -t -s -B $QUILT_PC/$patch/ $SUBDIR$file -+ if ! $QUILT_DIR/scripts/backup-files -r -t -s -B $QUILT_PC/$patch/ $SUBDIR$file - then - printf $"Failed to remove file %s from patch %s\n" \ - "$SUBDIR$file" "$(print_patch $patch)" >&2 -Index: quilt-0.45/quilt/snapshot.in -=================================================================== ---- quilt-0.45.orig/quilt/snapshot.in 2006-06-16 12:08:28.000000000 +0200 -+++ quilt-0.45/quilt/snapshot.in 2006-06-16 12:08:33.000000000 +0200 -@@ -85,7 +85,7 @@ - } - { print } - ' \ --| $QUILT_LIB/backup-files -b -s -L -f - -B "$QUILT_PC/$snap_subdir/" -+| $QUILT_DIR/scripts/backup-files -b -s -L -f - -B "$QUILT_PC/$snap_subdir/" - - ### Local Variables: - ### mode: shell-script -Index: quilt-0.45/quilt/scripts/backup-files.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ quilt-0.45/quilt/scripts/backup-files.in 2006-06-16 12:08:33.000000000 +0200 -@@ -0,0 +1,269 @@ -+#! @BASH@ -+ -+set -e -+ -+# File: backup-files.sh -+ -+# Copyright (C) 2006 Steve Langasek <vorlon@debian.org> -+# portions Copyright (C) 2003, 2004, 2005, 2006 Andreas Gruenbacher -+# <agruen@suse.de>, SuSE Labs -+ -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; version 2 dated June, 1991. -+ -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. -+ -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -+# MA 02110-1301, USA. -+ -+ -+# Create backup files of a list of files similar to GNU patch. A path -+# name prefix and suffix for the backup file can be specified with the -+# -B and -z options. -+ -+usage () { -+ progname="$1" -+ printf "Usage: %s [-B prefix] [-z suffix] [-f {file|-}] [-s] [-b|-r|-x] [-t] [-L] {file|-} ...\n"\ -+ "\n"\ -+ "\tCreate hard linked backup copies of a list of files\n"\ -+ "\tread from standard input.\n"\ -+ "\n"\ -+ "\t-b\tCreate backup\n"\ -+ "\t-r\tRestore the backup\n"\ -+ "\t-x\tRemove backup files and empty parent directories\n"\ -+ "\t-B\tPath name prefix for backup files\n"\ -+ "\t-z\tPath name suffix for backup files\n"\ -+ "\t-s\tSilent operation; only print error messages\n"\ -+ "\t-f\tRead the filenames to process from file (- = standard input)\n"\ -+ "\t-t\tTouch original files after restore (update their mtimes)\n\n"\ -+ "\t-L\tEnsure that when finished, the source file has a link count of 1\n\n", \ -+ "$progname" -+} -+ -+link_or_copy_file() { -+ from="$1" -+ to="$2" -+ if ! ln "$from" "$to" || [ -d "$to" ]; then -+ cp -dp --remove-destination "$from" "$to" -+ fi -+} -+ -+ensure_nolinks() { -+ filename="$1" -+ -+ link_count=$(stat -c '%h' "$filename") -+ if [ -z "$link_count" ] || [ "$link_count" -gt 1 ]; then -+ dirname=$(dirname "$filename") -+ basename=$(basename "$filename") -+ # Temp file name is "path/to/.file.XXXXXX" -+ tmpname=$(mktemp "${dirname}/.${basename}.XXXXXX") -+ cp -dp "$filename" "$tmpname" -+ mv "$tmpname" "$filename" -+ fi -+} -+ -+process_file() { -+ file="$1" -+ backup="${OPT_PREFIX}${file}${OPT_SUFFIX}" -+ -+ if [ "$OPT_WHAT" == "backup" ]; then -+ if [ -e "$backup" ]; then -+ rm "$backup" -+ else -+ mkdir -p "$(dirname "$backup")" -+ fi -+ if [ ! -e "$file" ]; then -+ $ECHO "New file $file" -+ touch "$backup" -+ chmod 000 "$backup" -+ else -+ $ECHO "Copying $file" -+ link_or_copy_file "$file" "$backup" -+ if [ -n "$OPT_NOLINKS" ]; then -+ ensure_nolinks "$file" -+ fi -+ if [ -n "OPT_TOUCH" ]; then -+ touch "$backup" -+ fi -+ fi -+ elif [ "$OPT_WHAT" == "restore" ]; then -+ mkdir -p "$(dirname "$file")" -+ -+ if [ ! -e "$backup" ]; then -+ return 1 -+ fi -+ if [ ! -s "$backup" ]; then -+ if [ -e "$file" ]; then -+ rm "$file" -+ fi -+ $ECHO "Removing $file" -+ rm "$backup" -+ while [ -d "${backup%/*}" ] && ! [ -L "${backup%/*}" ] -+ do -+ backup="${backup%/*}" -+ rmdir --ignore-fail-on-non-empty "$backup" 2>/dev/null -+ if [ -d "$backup" ]; then -+ break -+ fi -+ done -+ else -+ $ECHO "Restoring $file" -+ if [ -e "$file" ]; then -+ rm "$file" -+ fi -+ link_or_copy_file "$backup" "$file" -+ rm "$backup" -+ while [ -d "${backup%/*}" ] && ! [ -L "${backup%/*}" ] -+ do -+ backup="${backup%/*}" -+ rmdir --ignore-fail-on-non-empty "$backup" 2>/dev/null -+ if [ -d "$backup" ]; then -+ break -+ fi -+ done -+ if [ -n "$OPT_NOLINKS" ]; then -+ ensure_nolinks "$file" -+ fi -+ if [ -n "$OPT_TOUCH" ]; then -+ touch "$file" -+ fi -+ fi -+ elif [ "$OPT_WHAT" == "remove" ]; then -+ if [ -e "$backup" ]; then -+ rm "$backup" -+ fi -+ while [ -d "${backup%/*}" ] && ! [ -L "${backup%/*}" ] -+ do -+ backup="${backup%/*}" -+ rmdir --ignore-fail-on-non-empty "$backup" 2>/dev/null -+ if [ -d "$backup" ]; then -+ break -+ fi -+ done -+ elif [ "$OPT_WHAT" == "noop" ]; then -+ if [ -e "$file" ] && [ -n "$OPT_NOLINKS" ]; then -+ ensure_nolinks "$file" -+ fi -+ else -+ return 1 -+ fi -+} -+ -+walk() { -+ path="$1" -+ if [ ! -f "$path" ]; then -+ return 0 -+ fi -+ -+ if [ "${path#$OPT_PREFIX}" == "$path" ] -+ then -+ # prefix does not match -+ return 0 -+ fi -+ path="${path#$OPT_PREFIX}" -+ -+ if [ -n "$OPT_SUFFIX" ] && [ "${path%$OPT_SUFFIX}" == "$path" ] -+ then -+ # suffix does not match -+ return 0 -+ fi -+ path="${path%$OPT_SUFFIX}" -+ -+ process_file "$path" -+} -+ -+ -+ECHO=echo -+declare -a FILELIST -+progname="$0" -+while [ $# -gt 0 ]; do -+ case $1 in -+ -b) OPT_WHAT=backup -+ ;; -+ -r) OPT_WHAT=restore -+ ;; -+ -x) OPT_WHAT=remove -+ ;; -+ -B) OPT_PREFIX=$2 -+ shift -+ ;; -+ -f) OPT_FILE=$2 -+ shift -+ ;; -+ -z) OPT_SUFFIX=$2 -+ shift -+ ;; -+ -s) ECHO=: -+ ;; -+ -L) OPT_NOLINKS=1 -+ ;; -+ -t) OPT_TOUCH=1 -+ ;; -+ -?*) usage "$progname" -+ exit 0 -+ ;; -+ *) FILELIST=($1) -+ ;; -+ esac -+ -+ shift -+done -+ -+if [ -z "${OPT_PREFIX}${OPT_SUFFIX}" ]; then -+ usage "$progname" -+ exit 1 -+fi -+if [ ${#FILELIST[@]} == 0 ] && [ -z "$OPT_FILE" ]; then -+ usage "$progname" -+ exit 1 -+fi -+ -+if [ -n "$OPT_FILE" ]; then -+ cat "$OPT_FILE" \ -+ | while read nextfile; do -+ process_file "$nextfile" -+ done -+fi -+ -+I=0 -+while [ $I -lt ${#FILELIST[@]} ]; do -+ -+ case "${FILELIST[$I]}" in -+ -) -+ path="${OPT_PREFIX%/*}" -+ if ! [ -n "$path" ] && [ -d "$path" ] ; then -+ I=$(($I+1)) -+ continue -+ fi -+ -+ find "$path" -mindepth 1 \( -type f -o -type d \) -print 2>/dev/null \ -+ | while read -+ do -+ if [ -d "$REPLY" ] -+ then -+ if ! [ -r "$REPLY" ] || ! [ -x "$REPLY" ] -+ then -+ echo "$REPLY: Permission denied" -+ exit 1 -+ fi -+ else -+ walk "$REPLY" -+ fi -+ done -+ if [ $? != 0 ]; then -+ exit 1 -+ fi -+ ;; -+ *) -+ process_file "${FILELIST[$I]}" -+ ;; -+ esac -+ -+ I=$(($I+1)) -+done diff --git a/private/dev-util/quilt/files/quilt-0.45-fail-on-unmounted-proc.patch b/private/dev-util/quilt/files/quilt-0.45-fail-on-unmounted-proc.patch deleted file mode 100644 index a63775f..0000000 --- a/private/dev-util/quilt/files/quilt-0.45-fail-on-unmounted-proc.patch +++ /dev/null @@ -1,19 +0,0 @@ -Let patch-wrapper die with an informative message when /proc is not mounted -althrough it needs it to pass the patching request to GNU patch since it -fails to understand all options. - -Index: quilt-0.45/bin/patch-wrapper.in -=================================================================== ---- quilt-0.45.orig/bin/patch-wrapper.in 2006-07-31 13:49:07.000000000 +0200 -+++ quilt-0.45/bin/patch-wrapper.in 2006-07-31 13:50:07.000000000 +0200 -@@ -171,6 +171,10 @@ - if [ -n "$opt_input" ] - then - patch=$opt_input -+ elif [ ! -e /proc/self ] -+ then -+ echo "patch-wrapper: /proc not mounted!" >&2 -+ exit 1 - elif [ -e /proc/self/fd/0 ] - then - patch=$(readlink /proc/self/fd/0) diff --git a/private/dev-util/quilt/files/quilt-0.45-no-graphviz.patch b/private/dev-util/quilt/files/quilt-0.45-no-graphviz.patch index 769f4a5..1654b10 100644 --- a/private/dev-util/quilt/files/quilt-0.45-no-graphviz.patch +++ b/private/dev-util/quilt/files/quilt-0.45-no-graphviz.patch @@ -1,20 +1,19 @@ -Index: quilt-0.45/Makefile.in -=================================================================== ---- quilt-0.45.orig/Makefile.in -+++ quilt-0.45/Makefile.in -@@ -74,7 +74,7 @@ QUILT := $(QUILT_IN) +diff -Nupr quilt-0.45.orig/Makefile.in quilt-0.45/Makefile.in +--- quilt-0.45.orig/Makefile.in 2006-03-25 13:07:26.000000000 +0100 ++++ quilt-0.45/Makefile.in 2006-12-27 15:18:36.000000000 +0100 +@@ -80,8 +80,7 @@ QUILT := $(QUILT_IN) SRC += $(QUILT_SRC:%=quilt/%) DIRT += $(QUILT_IN:%=quilt/%) -SCRIPTS_IN := patchfns parse-patch inspect dependency-graph edmail \ -+SCRIPTS_IN := patchfns parse-patch inspect edmail \ - remove-trailing-ws backup-files +- remove-trailing-ws ++SCRIPTS_IN := patchfns parse-patch inspect edmail remove-trailing-ws SCRIPTS_SRC := $(SCRIPTS_IN:%=%.in) -Index: quilt-0.45/bash_completion -=================================================================== ---- quilt-0.45.orig/bash_completion -+++ quilt-0.45/bash_completion + SCRIPTS := $(SCRIPTS_IN) +diff -Nupr quilt-0.45.orig/bash_completion quilt-0.45/bash_completion +--- quilt-0.45.orig/bash_completion 2006-02-03 08:38:15.000000000 +0100 ++++ quilt-0.45/bash_completion 2006-12-27 15:17:58.000000000 +0100 @@ -95,7 +95,7 @@ _quilt_completion() prev=${COMP_WORDS[COMP_CWORD-1]} diff --git a/private/dev-util/quilt/files/quilt-0.45-po-updates.patch b/private/dev-util/quilt/files/quilt-0.45-po-updates.patch deleted file mode 100644 index e6c6891..0000000 --- a/private/dev-util/quilt/files/quilt-0.45-po-updates.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - Makefile.in | 1 + - po/fr.po | 4 ---- - 2 files changed, 1 insertion(+), 4 deletions(-) - ---- quilt-0.45.orig/Makefile.in -+++ quilt-0.45/Makefile.in -@@ -132,6 +132,7 @@ - $(MSGFMT) --statistics -o $@ $< - - %.po : po/quilt.pot -+ $(MSGUNIQ) -o $@.tmp $@ && mv $@.tmp $@ - $(MSGMERGE) -o $@ $@ $^ - - scripts : $(BIN:%=bin/%) $(QUILT:%=quilt/%) \ diff --git a/private/dev-util/quilt/files/quilt-0.45-push.patch b/private/dev-util/quilt/files/quilt-0.45-push.patch deleted file mode 100644 index 1e78237..0000000 --- a/private/dev-util/quilt/files/quilt-0.45-push.patch +++ /dev/null @@ -1,44 +0,0 @@ - * Make sure that quilt fails when trying to push a non existant patch (ie - if there is a typo in the serie file) unless -f is provided. - (Closes: #358875). - -Upstream status: they asked for some cleanups, which are done. To be submitted. - ---- - quilt/push.in | 7 +++++++ - test/missing.test | 4 ++++ - 2 files changed, 11 insertions(+) - -Index: quilt-0.45/quilt/push.in -=================================================================== ---- quilt-0.45.orig/quilt/push.in 2006-06-16 12:08:33.000000000 +0200 -+++ quilt-0.45/quilt/push.in 2006-06-16 12:08:42.000000000 +0200 -@@ -183,6 +183,13 @@ - no_reject_files="-r $tmp" - fi - -+ if [ ! -e "$patch_file" -a -z "$opt_force" ] -+ then -+ printf $"Patch %s does not exist\n" \ -+ "$(print_patch $patch)" >&2 -+ return 1 -+ fi -+ - apply_patch $patch "$patch_file" - status=$? - trap "" SIGINT -Index: quilt-0.45/test/missing.test -=================================================================== ---- quilt-0.45.orig/test/missing.test 2006-06-16 12:08:28.000000000 +0200 -+++ quilt-0.45/test/missing.test 2006-06-16 12:08:42.000000000 +0200 -@@ -7,6 +7,10 @@ - < missing2.diff - - $ quilt push -qa -+ > Patch patches/missing1.diff does not exist -+ > Applying patch patches/missing1.diff -+ -+ $ quilt push -qaf - > Applying patch patches/missing1.diff - > Patch patches/missing1.diff does not exist; applied empty patch - > Applying patch patches/missing2.diff diff --git a/private/dev-util/quilt/files/quilt-0.45-quilt.1.patch b/private/dev-util/quilt/files/quilt-0.45-quilt.1.patch deleted file mode 100644 index 3f5e543..0000000 --- a/private/dev-util/quilt/files/quilt-0.45-quilt.1.patch +++ /dev/null @@ -1,25 +0,0 @@ - * Let the manpage make clearer that literal QUILT_COMMAND_ARGS is - not read (Closes: #354997) - -Upstream status: not submitted - ---- - Makefile.in | 1 + - doc/quilt.1.in | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -Index: quilt-0.45/doc/quilt.1.in -=================================================================== ---- quilt-0.45.orig/doc/quilt.1.in 2006-06-16 12:08:39.000000000 +0200 -+++ quilt-0.45/doc/quilt.1.in 2006-06-16 12:08:59.000000000 +0200 -@@ -141,8 +141,8 @@ - - Upon startup, quilt evaluates the file .quiltrc in the user's home - directory, or the file specified with the --quiltrc option. This file --is a regular bash script. Default options can be passed to any command --by defining a QUILT_COMMAND_ARGS variable. For example, -+is a regular bash script. Default options can be passed to any COMMAND -+by defining a QUILT_${COMMAND}_ARGS variable. For example, - QUILT_DIFF_ARGS="--color=auto" causes the output of quilt diff to be - syntax colored when writing to a terminal. - diff --git a/private/dev-util/quilt/files/quilt-0.45-series-exists.patch b/private/dev-util/quilt/files/quilt-0.45-series-exists.patch deleted file mode 100644 index 836167c..0000000 --- a/private/dev-util/quilt/files/quilt-0.45-series-exists.patch +++ /dev/null @@ -1,22 +0,0 @@ -Displays an error message when the $SERIES file does not exist and when run -in verbose mode. - -Closes: #369908 - -Status wrt upstream: not submitted. - - -Index: quilt-0.45/quilt/scripts/patchfns.in -=================================================================== ---- quilt-0.45.orig/quilt/scripts/patchfns.in 2006-06-16 12:45:26.000000000 +0200 -+++ quilt-0.45/quilt/scripts/patchfns.in 2006-06-16 12:46:19.000000000 +0200 -@@ -308,6 +308,9 @@ - sed -e '/^$/d' -e '/^#/d' -e 's/^[ '$'\t'']*//' \ - -e 's/[ '$'\t''].*//' $SERIES - else -+ if [ "$opt_verbose" ]; then -+ echo "series file not found: $SERIES" >&2 -+ fi - return 1 - fi - } diff --git a/private/dev-util/quilt/files/quilt-0.45-testsuite.patch b/private/dev-util/quilt/files/quilt-0.45-testsuite.patch index 167b8d9..2b3d5e8 100644 --- a/private/dev-util/quilt/files/quilt-0.45-testsuite.patch +++ b/private/dev-util/quilt/files/quilt-0.45-testsuite.patch @@ -1,114 +1,39 @@ -Cleanup a bit the environment handling around the testsuite. - -Upstream status: Submitted 060427 - ---- - Makefile.in | 9 +-------- - test/run | 20 ++++++++++++++++++++ - 2 files changed, 21 insertions(+), 8 deletions(-) - -Index: quilt-0.45/Makefile.in -=================================================================== ---- quilt-0.45.orig/Makefile.in -+++ quilt-0.45/Makefile.in -@@ -363,10 +363,6 @@ test/.depend : Makefile $(TESTS) - { print FILENAME, ":", "quilt/"$$1 }' quilt/*.in; \ - ) | sort -u | $(SED) -re 's:^test/(.*)\.test:test/.\1.ok:' > $@ +diff -Nrup quilt-0.46.orig/test/delete.test quilt-0.46/test/delete.test +--- quilt-0.46.orig/test/delete.test 2006-09-22 14:52:00.000000000 +0200 ++++ quilt-0.46/test/delete.test 2006-12-27 16:00:31.000000000 +0100 +@@ -70,35 +70,5 @@ Test the delete command. --ifneq ($(shell . $(QUILTRC) ; echo $$QUILT_PATCHES_PREFIX),) --CHECK_ENV := P=patches/; _P=../patches/; export P _P --endif -- - # Each tests dependencies are stored in test/.depend - ifneq ($(findstring check-,$(MAKECMDGOALS)),) - test/.%.ok : test/%.test FORCE -@@ -374,10 +370,7 @@ else - test/.%.ok : test/%.test - endif - @echo "[$(<F)]" -- @LANG=C; \ -- export LANG ; \ -- $(CHECK_ENV); \ -- cd $(@D); \ -+ @cd $(@D); \ - ./run $(<F) - @touch $@ - -Index: quilt-0.45/test/file-not-found.test -=================================================================== ---- /dev/null -+++ quilt-0.45/test/file-not-found.test -@@ -0,0 +1,42 @@ -+# Try to push a patch touching a file which does not exist in this tree -+ -+$ rm -rf d -+$ mkdir -p d/patches -+$ cd d -+ -+$ mkdir subdir -+$ echo foo > subdir/file.txt -+$ echo bar > subdir/other.txt -+$ diff -u subdir/file.txt subdir/other.txt > patches/patch -+# simulate --no-timestamp -+$ sed 's|subdir/file.txt.*|subdir/file.txt|' patches/patch > patches/patch2 -+$ sed 's|subdir/other.txt.*|subdir/other.txt|' patches/patch2 > patches/patch -+$ rm subdir/other.txt patches/patch2 -+$ echo patch > patches/series -+ -+$ quilt push -+> Applying patch patches/patch -+> can't find file to patch at input line 3 -+> Perhaps you used the wrong -p or --strip option? -+> The text leading up to this was: -+> -------------------------- -+> |--- subdir/file.txt -+> |+++ subdir/other.txt -+> -------------------------- -+> No file to patch. Skipping patch. -+> 1 out of 1 hunk ignored -+> Patch patches/patch does not apply (enforce with -f) -+ -+$ quilt push -qf -+> Applying patch patches/patch -+> The text leading up to this was: -+> -------------------------- -+> |--- subdir/file.txt -+> |+++ subdir/other.txt -+> -------------------------- -+> No file to patch. Skipping patch. -+> 1 out of 1 hunk ignored -+> Patch patches/patch appears to be empty; applied -+ -+$ cd .. -+$ rm -rf d -Index: quilt-0.45/test/run -=================================================================== ---- quilt-0.45.orig/test/run -+++ quilt-0.45/test/run -@@ -35,6 +35,26 @@ my ($tests, $failed) = (0,0); - my $lineno; - my $width = ($ENV{COLUMNS} || 80) >> 1; + $ quilt series -+# cleanup the environment -+map { -+ undef $ENV{$_} if defined($ENV{$_}); -+} qw(QUILT_PATCHES QUILT_PC LANG LC_MESSAGES LC_CTYPE LC_ALL LANGUAGE); -+ -+$ENV{'LC_ALL'} = 'C'; -+open RC,"test.quiltrc" || die "cannot read RC file: $?\n"; -+while (<RC>) { -+ s/#.*$//; -+ if (m/^([^=]*)=(.*)$/) { -+ $ENV{$1}=$2; -+ } -+} -+ -+if (defined($ENV{'QUILT_PATCHES_PREFIX'}) && length($ENV{'QUILT_PATCHES_PREFIX'})) { -+ $ENV{'P'}='patches/'; -+ $ENV{'_P'}='../patches/'; -+} -+ -+# Run the tests - for (;;) { - my $line = <>; $lineno++; - if (defined $line) { +- # Force the pop operaton to fail +- $ echo "test3" > %{P}/series +- $ echo "test3" > .pc/applied-patches +- $ mkdir -p .pc/test3/dir +- $ touch .pc/test3/dir/file +- $ chmod a-rx .pc/test3/dir +- +- $ quilt delete "test3" +- > Removing patch %{P}test3 +- > .pc/test3/dir: Permission denied +- +- $ chmod a+rx .pc/test3/dir +- +- $ find .pc/test3 +- > .pc/test3 +- > .pc/test3/dir +- > .pc/test3/dir/file +- +- $ quilt applied +- > No patches applied +- +- $ quilt series +- > %{P}test3 +- +- $ quilt delete +- > No patches applied +- +- $ quilt delete test3 +- > Removed patch %{P}test3 +- + $ cd .. + $ rm -rf d diff --git a/private/dev-util/quilt/files/quilt-0.46-no-graphviz.patch b/private/dev-util/quilt/files/quilt-0.46-no-graphviz.patch new file mode 100644 index 0000000..cdc1dff --- /dev/null +++ b/private/dev-util/quilt/files/quilt-0.46-no-graphviz.patch @@ -0,0 +1,45 @@ +diff -Nurp quilt-0.46.orig/Makefile.in quilt-0.46/Makefile.in +--- quilt-0.46.orig/Makefile.in 2006-10-11 14:36:10.000000000 +0200 ++++ quilt-0.46/Makefile.in 2006-12-27 15:26:38.000000000 +0100 +@@ -81,8 +81,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) +diff -Nurp quilt-0.46.orig/bash_completion quilt-0.46/bash_completion +--- quilt-0.46.orig/bash_completion 2006-02-03 08:38:15.000000000 +0100 ++++ quilt-0.46/bash_completion 2006-12-27 15:26:38.000000000 +0100 +@@ -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 series setup snapshot top unapplied' + +@@ -188,19 +188,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/private/dev-util/quilt/files/quilt-0.46-testsuite.patch b/private/dev-util/quilt/files/quilt-0.46-testsuite.patch new file mode 100644 index 0000000..2b3d5e8 --- /dev/null +++ b/private/dev-util/quilt/files/quilt-0.46-testsuite.patch @@ -0,0 +1,39 @@ +diff -Nrup quilt-0.46.orig/test/delete.test quilt-0.46/test/delete.test +--- quilt-0.46.orig/test/delete.test 2006-09-22 14:52:00.000000000 +0200 ++++ quilt-0.46/test/delete.test 2006-12-27 16:00:31.000000000 +0100 +@@ -70,35 +70,5 @@ Test the delete command. + + $ quilt series + +- # Force the pop operaton to fail +- $ echo "test3" > %{P}/series +- $ echo "test3" > .pc/applied-patches +- $ mkdir -p .pc/test3/dir +- $ touch .pc/test3/dir/file +- $ chmod a-rx .pc/test3/dir +- +- $ quilt delete "test3" +- > Removing patch %{P}test3 +- > .pc/test3/dir: Permission denied +- +- $ chmod a+rx .pc/test3/dir +- +- $ find .pc/test3 +- > .pc/test3 +- > .pc/test3/dir +- > .pc/test3/dir/file +- +- $ quilt applied +- > No patches applied +- +- $ quilt series +- > %{P}test3 +- +- $ quilt delete +- > No patches applied +- +- $ quilt delete test3 +- > Removed patch %{P}test3 +- + $ cd .. + $ rm -rf d diff --git a/private/dev-util/quilt/quilt-0.45-r1.ebuild b/private/dev-util/quilt/quilt-0.45-r1.ebuild index 849d0df..c80b8ba 100644 --- a/private/dev-util/quilt/quilt-0.45-r1.ebuild +++ b/private/dev-util/quilt/quilt-0.45-r1.ebuild @@ -7,11 +7,6 @@ inherit bash-completion eutils DESCRIPTION="quilt patch manager" HOMEPAGE="http://savannah.nongnu.org/projects/quilt" SRC_URI="http://savannah.nongnu.org/download/quilt/${P}.tar.gz" -# There are packages hosted at the savannah site, but the maintainers do not -# update them. Which means we either have to hit the deb package or the suse -# RPM for a current version. -# yuck. -#SRC_URI="mirror://debian/pool/main/q/quilt/${P//-/_}.orig.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -26,16 +21,11 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-backup-files.patch - epatch "${FILESDIR}"/${P}-fail-on-unmounted-proc.patch - epatch "${FILESDIR}"/${P}-po-updates.patch - epatch "${FILESDIR}"/${P}-push.patch - epatch "${FILESDIR}"/${P}-quilt.1.patch - epatch "${FILESDIR}"/${P}-series-exists.patch - epatch "${FILESDIR}"/${P}-testsuite.patch + # Removing a bogus test from delete.test, that blocks the whole testsuite + epatch "${FILESDIR}/${P}-testsuite.patch" # Add support for USE=graphviz - use graphviz || epatch "${FILESDIR}"/${P}-no-graphviz.patch + use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch" } src_install() { diff --git a/private/dev-util/quilt/quilt-0.46.ebuild b/private/dev-util/quilt/quilt-0.46.ebuild new file mode 100644 index 0000000..c80b8ba --- /dev/null +++ b/private/dev-util/quilt/quilt-0.46.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit bash-completion 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 ~ppc ~x86" +IUSE="graphviz" + +RDEPEND="sys-apps/ed + dev-util/diffstat + graphviz? ( media-gfx/graphviz )" + +src_unpack() { + unpack ${A} + cd "${S}" + + # Removing a bogus test from delete.test, that blocks the whole testsuite + epatch "${FILESDIR}/${P}-testsuite.patch" + + # Add support for USE=graphviz + use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch" +} + +src_install() { + make BUILD_ROOT="${D}" install || die "make install failed" + + rm -rf ${D}/usr/share/doc/${P} + dodoc AUTHORS BUGS TODO quilt.changes doc/README doc/README.MAIL \ + doc/quilt.pdf doc/sample.quiltrc + + rm -rf ${D}/etc/bash_completion.d + dobashcompletion bash_completion +} |