From 56da625c8a806de47c781d5109cc754b1a8bc4b7 Mon Sep 17 00:00:00 2001
From: Jim Ramsay <lack@gentoo.org>
Date: Fri, 9 Feb 2007 17:31:44 +0000
Subject: Fixed filename collision with x11-wm/afterstep (Bug 165956) (Portage
 version: 2.1.2-r8)

---
 rox-base/pager/ChangeLog                   | 11 +++++++++--
 rox-base/pager/files/digest-pager-1.0.1    |  3 ---
 rox-base/pager/files/digest-pager-1.0.1-r1 |  3 +++
 rox-base/pager/files/digest-pager-1.1      |  3 ---
 rox-base/pager/files/digest-pager-1.1-r1   |  3 +++
 rox-base/pager/pager-1.0.1-r1.ebuild       | 29 +++++++++++++++++++++++++++++
 rox-base/pager/pager-1.0.1.ebuild          | 28 ----------------------------
 rox-base/pager/pager-1.1-r1.ebuild         | 24 ++++++++++++++++++++++++
 rox-base/pager/pager-1.1.ebuild            | 23 -----------------------
 9 files changed, 68 insertions(+), 59 deletions(-)
 delete mode 100644 rox-base/pager/files/digest-pager-1.0.1
 create mode 100644 rox-base/pager/files/digest-pager-1.0.1-r1
 delete mode 100644 rox-base/pager/files/digest-pager-1.1
 create mode 100644 rox-base/pager/files/digest-pager-1.1-r1
 create mode 100644 rox-base/pager/pager-1.0.1-r1.ebuild
 delete mode 100644 rox-base/pager/pager-1.0.1.ebuild
 create mode 100644 rox-base/pager/pager-1.1-r1.ebuild
 delete mode 100644 rox-base/pager/pager-1.1.ebuild

(limited to 'rox-base/pager')

diff --git a/rox-base/pager/ChangeLog b/rox-base/pager/ChangeLog
index 43cdaae1636b..03b51e2ad37a 100644
--- 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/files/digest-pager-1.0.1 b/rox-base/pager/files/digest-pager-1.0.1
deleted file mode 100644
index 90030a1d7ee4..000000000000
--- a/rox-base/pager/files/digest-pager-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 78e00f3d0d827edfe182bf4db906272a pager-1.0.1.tgz 46081
-RMD160 cc455f2f665abe7c11285bade1b5667e3f738e37 pager-1.0.1.tgz 46081
-SHA256 3e7b573a68373543b08b56bf1f9cbad269625255a85c2503057c1ee224d750ae pager-1.0.1.tgz 46081
diff --git a/rox-base/pager/files/digest-pager-1.0.1-r1 b/rox-base/pager/files/digest-pager-1.0.1-r1
new file mode 100644
index 000000000000..90030a1d7ee4
--- /dev/null
+++ b/rox-base/pager/files/digest-pager-1.0.1-r1
@@ -0,0 +1,3 @@
+MD5 78e00f3d0d827edfe182bf4db906272a pager-1.0.1.tgz 46081
+RMD160 cc455f2f665abe7c11285bade1b5667e3f738e37 pager-1.0.1.tgz 46081
+SHA256 3e7b573a68373543b08b56bf1f9cbad269625255a85c2503057c1ee224d750ae pager-1.0.1.tgz 46081
diff --git a/rox-base/pager/files/digest-pager-1.1 b/rox-base/pager/files/digest-pager-1.1
deleted file mode 100644
index f4cd25562610..000000000000
--- a/rox-base/pager/files/digest-pager-1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 62b0780d2e1b0ba14ce886853c4d06c8 pager-1.1.tar.bz2 35700
-RMD160 d09bdcda4850577b63df575cc3fd391310b5b11a pager-1.1.tar.bz2 35700
-SHA256 c4f3de167f1c53a0e17d129b5f47abe70c7d1ec9f390d55479f4e6ec30cb3e62 pager-1.1.tar.bz2 35700
diff --git a/rox-base/pager/files/digest-pager-1.1-r1 b/rox-base/pager/files/digest-pager-1.1-r1
new file mode 100644
index 000000000000..f4cd25562610
--- /dev/null
+++ b/rox-base/pager/files/digest-pager-1.1-r1
@@ -0,0 +1,3 @@
+MD5 62b0780d2e1b0ba14ce886853c4d06c8 pager-1.1.tar.bz2 35700
+RMD160 d09bdcda4850577b63df575cc3fd391310b5b11a pager-1.1.tar.bz2 35700
+SHA256 c4f3de167f1c53a0e17d129b5f47abe70c7d1ec9f390d55479f4e6ec30cb3e62 pager-1.1.tar.bz2 35700
diff --git a/rox-base/pager/pager-1.0.1-r1.ebuild b/rox-base/pager/pager-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..bacfe65f4369
--- /dev/null
+++ b/rox-base/pager/pager-1.0.1-r1.ebuild
@@ -0,0 +1,29 @@
+# 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-r1.ebuild,v 1.1 2007/02/09 17:31:44 lack Exp $
+
+inherit rox eutils
+
+PAGER_PATCH_FN="01_all_libwnck-2-fix.patch"
+DESCRIPTION="Pager - A pager applet for ROX-Filer"
+HOMEPAGE="http://rox.sourceforge.net/"
+SRC_URI="mirror://sourceforge/rox/${P}.tgz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libwnck-2.4.0"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.20"
+
+APPNAME=Pager
+APPNAME_COLLISION=True
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}"/${P}/${APPNAME}/src
+	epatch "${FILESDIR}"/${PAGER_PATCH_FN}
+}
diff --git a/rox-base/pager/pager-1.0.1.ebuild b/rox-base/pager/pager-1.0.1.ebuild
deleted file mode 100644
index 28dac0b0c861..000000000000
--- a/rox-base/pager/pager-1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 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 $
-
-inherit rox eutils
-
-PAGER_PATCH_FN="01_all_libwnck-2-fix.patch"
-DESCRIPTION="Pager - A pager applet for ROX-Filer"
-HOMEPAGE="http://rox.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rox/${P}.tgz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/libwnck-2.4.0"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.20"
-
-APPNAME=Pager
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"/${P}/${APPNAME}/src
-	epatch "${FILESDIR}"/${PAGER_PATCH_FN}
-}
diff --git a/rox-base/pager/pager-1.1-r1.ebuild b/rox-base/pager/pager-1.1-r1.ebuild
new file mode 100644
index 000000000000..d75225fc9d05
--- /dev/null
+++ b/rox-base/pager/pager-1.1-r1.ebuild
@@ -0,0 +1,24 @@
+# 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-r1.ebuild,v 1.1 2007/02/09 17:31:44 lack Exp $
+
+ROX_CLIB_VER=2.1.7
+inherit rox eutils
+
+DESCRIPTION="Pager - A pager applet for ROX-Filer"
+HOMEPAGE="http://rox.sourceforge.net/"
+SRC_URI="mirror://sourceforge/rox/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libwnck-2.4.0"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.20"
+
+APPNAME=Pager
+APPNAME_COLLISION=True
+
diff --git a/rox-base/pager/pager-1.1.ebuild b/rox-base/pager/pager-1.1.ebuild
deleted file mode 100644
index 8b346e894105..000000000000
--- a/rox-base/pager/pager-1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 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 $
-
-ROX_CLIB_VER=2.1.7
-inherit rox eutils
-
-DESCRIPTION="Pager - A pager applet for ROX-Filer"
-HOMEPAGE="http://rox.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rox/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/libwnck-2.4.0"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.20"
-
-APPNAME=Pager
-
-- 
cgit v1.2.3-65-gdbad