Fixed filename collision with x11-wm/afterstep (Bug 165956)

Package-Manager: portage-2.1.2-r8

diff --git a/rox-base/pager/ChangeLog b/rox-base/pager/ChangeLog
index 43cdaae1636ba001d66075a21d172d5d338852f9..03b51e2ad37a4ba51620a624af47bc3152f9ad8d 100644 (file)
--- a/rox-base/pager/ChangeLog
+++ b/rox-base/pager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for rox-base/pager
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/ChangeLog,v 1.11 2006/11/27 19:10:49 lack Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/ChangeLog,v 1.12 2007/02/09 17:31:44 lack Exp $
+
+*pager-1.1-r1 (09 Feb 2007)
+*pager-1.0.1-r1 (09 Feb 2007)
+
+  09 Feb 2007; Jim Ramsay <lack@gentoo.org> -pager-1.0.1.ebuild,
+  +pager-1.0.1-r1.ebuild, -pager-1.1.ebuild, +pager-1.1-r1.ebuild:
+  Fixed filename collision with x11-wm/afterstep (Bug 165956)
 
 *pager-1.1 (27 Nov 2006)
 

diff --git a/rox-base/pager/Manifest b/rox-base/pager/Manifest
index 852eda5c5e1f171f1b46d07dff76ebd74864010e..fae8ada14d602530629e53342f7b54cec69eeb31 100644 (file)
--- a/rox-base/pager/Manifest
+++ b/rox-base/pager/Manifest
@@ -4,25 +4,25 @@ RMD160 26278c6ff6965aa0b1df9db20eb105494d3bfb5b files/01_all_libwnck-2-fix.patch
 SHA256 b2b267b3f59c0d088ed5be0d1533638a5e5d04ada6211149f7a094a47194e624 files/01_all_libwnck-2-fix.patch 13436
 DIST pager-1.0.1.tgz 46081 RMD160 cc455f2f665abe7c11285bade1b5667e3f738e37 SHA1 96c12aea322475770185c3d793f9ff1351dfbd46 SHA256 3e7b573a68373543b08b56bf1f9cbad269625255a85c2503057c1ee224d750ae
 DIST pager-1.1.tar.bz2 35700 RMD160 d09bdcda4850577b63df575cc3fd391310b5b11a SHA1 0c04b61e1a20bf77765f22e1dd4b9100dc3e9b67 SHA256 c4f3de167f1c53a0e17d129b5f47abe70c7d1ec9f390d55479f4e6ec30cb3e62
-EBUILD pager-1.0.1.ebuild 669 RMD160 31f51a4e579b596a5a32b4204a091228e301669c SHA1 a6a578064522c831dffeaf336f56c8e5242fe0cd SHA256 f4c68832c3bfa459a74ccd91b08c151f99b38821486f43585987bbaf8be76216
-MD5 5abad53777b7efd03e0b3110f9c91832 pager-1.0.1.ebuild 669
-RMD160 31f51a4e579b596a5a32b4204a091228e301669c pager-1.0.1.ebuild 669
-SHA256 f4c68832c3bfa459a74ccd91b08c151f99b38821486f43585987bbaf8be76216 pager-1.0.1.ebuild 669
-EBUILD pager-1.1.ebuild 539 RMD160 7db08b69fdea8a54c0cd056f98ba90c82b60c85e SHA1 3db9ae42bc23673c572b3adb907225d3b5099e9e SHA256 1ee6c5448db2a82e4a6264fd526846c8f6a5e2a7ffe22aca24c93f63caa8f0e5
-MD5 4a126e7b739def90eae639907751be57 pager-1.1.ebuild 539
-RMD160 7db08b69fdea8a54c0cd056f98ba90c82b60c85e pager-1.1.ebuild 539
-SHA256 1ee6c5448db2a82e4a6264fd526846c8f6a5e2a7ffe22aca24c93f63caa8f0e5 pager-1.1.ebuild 539
-MISC ChangeLog 1892 RMD160 65e7ec2eb6e024503da1ce6f49d4108c7180ce9d SHA1 3086326534b1e9d5971cbc41e83af97ac321b0d5 SHA256 41c0d4e16f9a6cded2231045d202ad1d4d8466f10895fbf8af9744dec8a2c55a
-MD5 ad36f2828b9cfa328b37c24ea2a8a83d ChangeLog 1892
-RMD160 65e7ec2eb6e024503da1ce6f49d4108c7180ce9d ChangeLog 1892
-SHA256 41c0d4e16f9a6cded2231045d202ad1d4d8466f10895fbf8af9744dec8a2c55a ChangeLog 1892
+EBUILD pager-1.0.1-r1.ebuild 694 RMD160 1edb07e748eab27b83b7bba493655fc4aa273e40 SHA1 7f3e7fc220971cbee13557e8d656467b8f188166 SHA256 12e2a0e329f6995384c78b480c413c44f5a68193ba2416d33aac188523d6d0b0
+MD5 5d4657ef1b50b23ae8a1a43faefb9024 pager-1.0.1-r1.ebuild 694
+RMD160 1edb07e748eab27b83b7bba493655fc4aa273e40 pager-1.0.1-r1.ebuild 694
+SHA256 12e2a0e329f6995384c78b480c413c44f5a68193ba2416d33aac188523d6d0b0 pager-1.0.1-r1.ebuild 694
+EBUILD pager-1.1-r1.ebuild 565 RMD160 2ecfa2e541eb356e3bc566de937e4897b4d9a921 SHA1 ec372ed194fa57794fdd57ab7f54cc2bd6e27184 SHA256 62726fefd15ac908f225b4a4173989e23404d2b062268c97f3c675c2591e92d4
+MD5 ea01c00ab8a3405ff8ed120d8928cecc pager-1.1-r1.ebuild 565
+RMD160 2ecfa2e541eb356e3bc566de937e4897b4d9a921 pager-1.1-r1.ebuild 565
+SHA256 62726fefd15ac908f225b4a4173989e23404d2b062268c97f3c675c2591e92d4 pager-1.1-r1.ebuild 565
+MISC ChangeLog 2146 RMD160 b8f3758410fee58ed9fb384479232c3ff1a00d78 SHA1 f8e1eb954a146acf372ed6686229598283df1e37 SHA256 cc420f47dcdc39d0adc95bb86424409f3942e057a8ee1787ad8edf683a982944
+MD5 63c4f5794a2a5cde69b56abcf43ed075 ChangeLog 2146
+RMD160 b8f3758410fee58ed9fb384479232c3ff1a00d78 ChangeLog 2146
+SHA256 cc420f47dcdc39d0adc95bb86424409f3942e057a8ee1787ad8edf683a982944 ChangeLog 2146
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c metadata.xml 157
-MD5 6ed204579956bb9e7ec9350865b2804c files/digest-pager-1.0.1 223
-RMD160 0b68f6679f64876130611cb22076af34716901b2 files/digest-pager-1.0.1 223
-SHA256 54e18265b7617dd9df3fc72c244400e8a0f0bce5de0d826db066a91ba3cd7b8c files/digest-pager-1.0.1 223
-MD5 0207a766ee1900ef7071e9f38c5cb908 files/digest-pager-1.1 229
-RMD160 ca4805b7c4d4cc85e1aeb773d1938b29a614f8e0 files/digest-pager-1.1 229
-SHA256 b7ceb332e8a77115b31b7829b0c7d3b0a3713b0e0464ea42b63a51b25f633e1d files/digest-pager-1.1 229
+MD5 6ed204579956bb9e7ec9350865b2804c files/digest-pager-1.0.1-r1 223
+RMD160 0b68f6679f64876130611cb22076af34716901b2 files/digest-pager-1.0.1-r1 223
+SHA256 54e18265b7617dd9df3fc72c244400e8a0f0bce5de0d826db066a91ba3cd7b8c files/digest-pager-1.0.1-r1 223
+MD5 0207a766ee1900ef7071e9f38c5cb908 files/digest-pager-1.1-r1 229
+RMD160 ca4805b7c4d4cc85e1aeb773d1938b29a614f8e0 files/digest-pager-1.1-r1 229
+SHA256 b7ceb332e8a77115b31b7829b0c7d3b0a3713b0e0464ea42b63a51b25f633e1d files/digest-pager-1.1-r1 229

diff --git a/rox-base/pager/files/digest-pager-1.0.1 b/rox-base/pager/files/digest-pager-1.0.1-r1
similarity index 100%
rename from rox-base/pager/files/digest-pager-1.0.1
rename to rox-base/pager/files/digest-pager-1.0.1-r1

diff --git a/rox-base/pager/files/digest-pager-1.1 b/rox-base/pager/files/digest-pager-1.1-r1
similarity index 100%
rename from rox-base/pager/files/digest-pager-1.1
rename to rox-base/pager/files/digest-pager-1.1-r1

diff --git a/rox-base/pager/pager-1.0.1.ebuild b/rox-base/pager/pager-1.0.1-r1.ebuild
similarity index 75%
rename from rox-base/pager/pager-1.0.1.ebuild
rename to rox-base/pager/pager-1.0.1-r1.ebuild
index 28dac0b0c86107f770dfe5523a6b45871cc96dc7..bacfe65f4369badc7dad3c954447e27feb08ab69 100644 (file)
--- a/rox-base/pager/pager-1.0.1.ebuild
+++ b/rox-base/pager/pager-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/pager-1.0.1.ebuild,v 1.8 2006/11/20 18:11:40 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/pager-1.0.1-r1.ebuild,v 1.1 2007/02/09 17:31:44 lack Exp $
 
 inherit rox eutils
 
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
        >=dev-util/pkgconfig-0.20"
 
 APPNAME=Pager
+APPNAME_COLLISION=True
 
 src_unpack() {
        unpack ${A}

diff --git a/rox-base/pager/pager-1.1.ebuild b/rox-base/pager/pager-1.1-r1.ebuild
similarity index 69%
rename from rox-base/pager/pager-1.1.ebuild
rename to rox-base/pager/pager-1.1-r1.ebuild
index 8b346e8941054900546eb3bd0e14c8eda4b22645..d75225fc9d05ec5b16d27f40f7232a88032a1d16 100644 (file)
--- a/rox-base/pager/pager-1.1.ebuild
+++ b/rox-base/pager/pager-1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/pager-1.1.ebuild,v 1.2 2006/11/27 19:12:09 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/pager-1.1-r1.ebuild,v 1.1 2007/02/09 17:31:44 lack Exp $
 
 ROX_CLIB_VER=2.1.7
 inherit rox eutils
@@ -20,4 +20,5 @@ DEPEND="${RDEPEND}
        >=dev-util/pkgconfig-0.20"
 
 APPNAME=Pager
+APPNAME_COLLISION=True