Rename patch to be more consistent with official tree.

svn path=/; revision=18

5 files changed, 9 insertions, 11 deletions

diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 2211e5f..b4074b0 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -2,10 +2,10 @@ AUX 04-FlatSeparators-r5.patch 7674 RMD160 3142c9e9954f6fd8206409e22dc69011dd729
 AUX README.translucency 8910 RMD160 417b3416aef5ddd4b13672a2760d3736cac6f900 SHA1 c1cd348840df7774f62f67aa9e1b1e2ea78219de SHA256 0a4b3f143ee0b6fc32098cbd556b25fdc695a980bc8b4cf032b1dad4a4952ddb
 AUX VerticalSeparatorMargins.patch 3456 RMD160 95e2134f8596b1e73b3f09a92e635c9bc585b26a SHA1 d569de32acea88597ad8c6614b30566690d60f88 SHA256 7b79ab675277e3532a394a4b5b6192a989aa93ec244d4612d3a0804c84f7d848
 AUX fvwm-2.5.23-translucent-menus.diff 15765 RMD160 5629e1fcd6d41e7c9f5cfa0a62204d33d83d5c6f SHA1 2ff0c394e1e393cab8249efeeddf917d07a7ba78 SHA256 ad59f0aa1b73fb128143bf5a390185289c296e0d31a4e6e6ca5f046f414752cf
-AUX fvwm-menu-xlock-xlockmore-compat.patch 550 RMD160 72af6f306e5869581fcd48c84edfe00adea4a5b9 SHA1 0eccf83c3046e3822737c5facb23f547a062bff8 SHA256 5db8bc279f618096b23fed04b70b626c6ff50c104283d5ece505200db1e5a8af
+AUX fvwm-menu-xlock-xlockmore-compat.diff 550 RMD160 72af6f306e5869581fcd48c84edfe00adea4a5b9 SHA1 0eccf83c3046e3822737c5facb23f547a062bff8 SHA256 5db8bc279f618096b23fed04b70b626c6ff50c104283d5ece505200db1e5a8af
 DIST fvwm-2.5.25.tar.bz2 2516717 RMD160 bf77786a071838304eb4bf8cc14960196c235506 SHA1 8e0f0b1eb888f7fcc27a0dbcc32a5b0f2895df2b SHA256 212dafb5fbace4a72d7a2d2dd6df7445709bad6739162a72879e4a6e942d69fc
 DIST fvwm-2.5.26.tar.bz2 2509177 RMD160 47be927e61ef5411b668baec0e9a00d5691b3784 SHA1 26d9054c0f148a397eeaa9939be9329fb002831f SHA256 84aca15165f600c5c09095c94b3ad1f0bfe16ba25cf2097f76312a0fba89251d
 DIST fvwm-patchset-20070901-r2.tar.bz2 37255 RMD160 787fe6f49e497a225648dbdd30b0636d3416a5b0 SHA1 9d56b1f2703feb52987e6aeb22dc151bc0e10d67 SHA256 9342142d216ca5b89c161a9796a08c4effc1b3d8dd41090e3419b051fac639fa
-EBUILD fvwm-2.5.25.ebuild 4422 RMD160 d052e5cbc8e6de455d6dc7fde785d6ad0de42017 SHA1 6d93b42cc8d23dda028fc329e24bfd91778e198d SHA256 c1c0fb5601d2c5b6852e2da903eeb1eb680af59e3e10458d74303db00b393450
-EBUILD fvwm-2.5.26.ebuild 4830 RMD160 c285b4a6cdbc6da9017018732252a4dc41048d94 SHA1 96dfa3f94cebe88fbf7140c7791578d6530a0fa2 SHA256 5d26f6a7955ad8256b32f54b8a085e44e35e844bb2945c7a05476508f5aa630e
-EBUILD fvwm-9999.ebuild 6985 RMD160 fadfaa9ca384911f2a5930991a494c7ea80754ca SHA1 60c6c84d287b3c6c4fa2249bc8b7e1c816f8d0f2 SHA256 b7a725d6bd63582a89cfde414263acdf9b2c1709180039fce96d2273176e63a2
+EBUILD fvwm-2.5.25.ebuild 4302 RMD160 62659051a96557f70f75d488cfab3cfe67a0d81e SHA1 030bb71d97610417dbad250078d37487ca079c42 SHA256 e473c31ffbd365d79c44dd7168156c1d750fa6cb5bbf0bdc6f0f549a9f613b38
+EBUILD fvwm-2.5.26.ebuild 4829 RMD160 e53dd70b6674e9bd29dfa19fa01fdabaebda336c SHA1 b42365daf7d85c5a7f22d1e16e470045a1727e25 SHA256 3c85a4b160b853dceb00c35942525e5a211de187465a63a04ce3cfec6ddc4f38
+EBUILD fvwm-9999.ebuild 6984 RMD160 a1357ac42e391886aa7fe5a0333afc28e49ced1e SHA1 939415d4da5e87fad7a2119988638262773e7404 SHA256 be46ac780b3c0b6c051942394b9912580c2e28fb67c9748685ba38678436f14d
diff --git a/x11-wm/fvwm/files/fvwm-menu-xlock-xlockmore-compat.patch b/x11-wm/fvwm/files/fvwm-menu-xlock-xlockmore-compat.diff
index 7ceb510..7ceb510 100644
--- a/x11-wm/fvwm/files/fvwm-menu-xlock-xlockmore-compat.patch
+++ b/x11-wm/fvwm/files/fvwm-menu-xlock-xlockmore-compat.diff
diff --git a/x11-wm/fvwm/fvwm-2.5.25.ebuild b/x11-wm/fvwm/fvwm-2.5.25.ebuild
index 9b68653..0cddbb1 100644
--- a/x11-wm/fvwm/fvwm-2.5.25.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.25.ebuild
@@ -60,13 +60,11 @@ src_unpack() {
 	if ! use vanilla; then
 		cd "${S}"
 
-		# this patch enables fast translucent menus in fvwm. this is a
-		# minor tweak of a patch posted to fvwm-user mailing list by Olivier
-		# Chapuis in <20030827135125.GA6370@snoopy.folie>.
+		# Enables fast translucent menus; patch from fvwm-user mailing list.
 		epatch "${FILESDIR}/fvwm-2.5.23-translucent-menus.diff"
 
-		# This is a gentoo-specific trivial patch
-		epatch "${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.patch"
+		# A Gentoo-specific compatibility patch.
+		epatch "${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff"
 	fi
 }
 
diff --git a/x11-wm/fvwm/fvwm-2.5.26.ebuild b/x11-wm/fvwm/fvwm-2.5.26.ebuild
index b353f17..feef37b 100644
--- a/x11-wm/fvwm/fvwm-2.5.26.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.26.ebuild
@@ -80,7 +80,7 @@ src_unpack() {
 		epatch "${FILESDIR}/fvwm-2.5.23-translucent-menus.diff"
 
 		# This is a gentoo-specific trivial patch
-		epatch "${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.patch"
+		epatch "${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff"
 	fi
 }
 
diff --git a/x11-wm/fvwm/fvwm-9999.ebuild b/x11-wm/fvwm/fvwm-9999.ebuild
index 7d7cdfc..aaf18bc 100644
--- a/x11-wm/fvwm/fvwm-9999.ebuild
+++ b/x11-wm/fvwm/fvwm-9999.ebuild
@@ -83,7 +83,7 @@ src_unpack() {
 	# with the xlockmore implementation in portage.
 	# This is now unconditional, since it is trivial and there is
 	# no sense in not applying it.
-	cd ${S}; epatch ${EPATCH_SOURCE}/fvwm-menu-xlock-xlockmore-compat.patch
+	cd ${S}; epatch ${EPATCH_SOURCE}/fvwm-menu-xlock-xlockmore-compat.diff
 
 	cd "${S}"; eautoreconf
 }