[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/, x11-misc/xorg-cf-files/files/

2023-04-08 Thread Matt Turner
commit: 8df5ac652b38d4c1e903545e9001c2a54f5fab55
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Apr  9 04:02:25 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Apr  9 04:05:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8df5ac65

x11-misc/xorg-cf-files: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/xorg-cf-files/Manifest|  2 -
 .../files/xorg-cf-files-1.0.7-linux-riscv.patch| 56 --
 .../xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild| 46 --
 3 files changed, 104 deletions(-)

diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index f52e87655faf..017c98099822 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,3 +1 @@
-DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 
219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10
 SHA512 
159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
-DIST xorg-cf-files-1.0.7.tar.bz2 345575 BLAKE2B 
62ca33673b65cccb4c33c9bc138fac768862d3fd2a8e35d875b4a7af7938df3a2d1437bcb9661c8b84c69a73f60e5ae4a2bf58a003987dcd9293a3a948c97531
 SHA512 
0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e
 DIST xorg-cf-files-1.0.8.tar.xz 290280 BLAKE2B 
b822839f2effa091d7e60aa82e0356dc6770116566d9c78a6c0915b8f9e89eb4a3bf78a3bd5380607b3b3e4c1670fb1c6ef0b3ac8ca342cfc1ef141a925c927d
 SHA512 
cc633af889cd82346c3098df9185245c21aa9db7484343f8be9719f6e0b1fc0a9b09afb13b9b864668aa51944f2da797bbe896c807f629e89fc91506e6e63fb9

diff --git a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.7-linux-riscv.patch 
b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.7-linux-riscv.patch
deleted file mode 100644
index 143aa53a0280..
--- a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.7-linux-riscv.patch
+++ /dev/null
@@ -1,56 +0,0 @@
 a/Imake.cf
-+++ b/Imake.cf
-@@ -1037,6 +1037,17 @@
- #   define AArch64Architecture
- #   undef __aarch64__
- # endif
-+# if defined(__riscv)
-+#   undef __riscv
-+#   if __riscv_xlen == 64
-+# undef __riscv_xlen
-+# define RV64Architecture
-+#   endif
-+#   if __riscv_xlen == 32
-+# undef __riscv_xlen
-+# define RV32Architecture
-+#   endif
-+# endif
- #endif /* linux || __GLIBC__ */
- 
- #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || 
defined(__i386__) || defined(__x86__) || defined(__powerpc__) || 
defined(__sparc__) || defined(sparc))
 a/linux.cf
-+++ b/linux.cf
-@@ -584,7 +584,7 @@
- #define MkdirHierCmd  mkdir -p
- 
- #ifndef HaveLib64
--# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined 
(Ppc64Architecture) || defined (AArch64Architecture)
-+# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined 
(Ppc64Architecture) || defined (AArch64Architecture) || defined 
(RV64Architecture)
- #  define HaveLib64   YES
- # else
- #  define HaveLib64   NO
-@@ -1000,6 +1000,24 @@
- # define ServerExtraDefines-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
- #endif /* AArch64Architecture */
- 
-+#ifdef RV64Architecture
-+# ifndef OptimizedCDebugFlags
-+#  define OptimizedCDebugFlags -O2 GccAliasingArgs
-+# endif
-+# define LinuxMachineDefines  -D__riscv -D__riscv_xlen=64
-+# define ServerOSDefines  XFree86ServerOSDefines -DDDXTIME
-+# define ServerExtraDefines   -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
-+#endif /* RV64Architecture */
-+
-+#ifdef RV32Architecture
-+# ifndef OptimizedCDebugFlags
-+#  define OptimizedCDebugFlags -O2 GccAliasingArgs
-+# endif
-+# define LinuxMachineDefines  -D__riscv -D__riscv_xlen=32
-+# define ServerOSDefines  XFree86ServerOSDefines -DDDXTIME
-+# define ServerExtraDefines   -DGCCUSESGAS XFree86ServerDefines
-+#endif /* RV32Architecture */
-+
- #ifndef StandardDefines
- # ifdef __linux__
- #  define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
deleted file mode 100644
index 4d120a0e40a1..
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Old Imake-related build files"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf;
-SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
-   
https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2023-04-08 Thread Arthur Zamarin
commit: 52729e3034c4b8f7ff0b83175e1621ff18396085
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr  8 17:17:44 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr  8 17:17:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52729e30

x11-misc/xorg-cf-files: Stabilize 1.0.8 sparc, #903989

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
index 7d9184360342..09fcb176fc4a 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz;
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 BDEPEND="virtual/pkgconfig"
 



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2023-04-08 Thread Arthur Zamarin
commit: b6e4b4fe41d445f5e200fc97adc29f81b8c1fe18
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr  8 14:59:19 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr  8 14:59:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e4b4fe

x11-misc/xorg-cf-files: Stabilize 1.0.8 ppc64, #903989

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
index 787cf2a5b1ba..7d9184360342 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz;
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 BDEPEND="virtual/pkgconfig"
 



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2023-04-08 Thread Arthur Zamarin
commit: 82d1c143e7bd4ab016235af3d9a7db39bf82ccb3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr  8 14:46:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr  8 14:46:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82d1c143

x11-misc/xorg-cf-files: Stabilize 1.0.8 ppc, #903989

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
index 3dca419bbb67..787cf2a5b1ba 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz;
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 BDEPEND="virtual/pkgconfig"
 



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2023-04-08 Thread Arthur Zamarin
commit: 75f253dfc26f29fa9ca35357a965eda58010ac32
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr  8 10:45:14 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr  8 10:45:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f253df

x11-misc/xorg-cf-files: Stabilize 1.0.8 amd64, #903989

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
index 0263dfa4ec0f..3dca419bbb67 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz;
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 BDEPEND="virtual/pkgconfig"
 



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2023-04-08 Thread Arthur Zamarin
commit: d0639035f482ffdce5916f94eb8c21eae83267e3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr  8 09:56:30 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr  8 09:56:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0639035

x11-misc/xorg-cf-files: Stabilize 1.0.8 x86, #903989

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
index 2aeb2d870f1b..0263dfa4ec0f 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz;
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 BDEPEND="virtual/pkgconfig"
 



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2023-04-08 Thread Arthur Zamarin
commit: bd834fbb0db046e649196ba130104b4c05fafe74
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr  8 09:01:05 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr  8 09:01:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd834fbb

x11-misc/xorg-cf-files: Stabilize 1.0.8 arm, #903989

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
index 940dbe9c7956..2aeb2d870f1b 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz;
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 BDEPEND="virtual/pkgconfig"
 



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2023-04-08 Thread Arthur Zamarin
commit: c69a5014780c3aab2e45fcafb19f131cd452f165
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr  8 06:17:06 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr  8 06:17:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c69a5014

x11-misc/xorg-cf-files: Stabilize 1.0.8 arm64, #903989

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
index 14f2f7efe1b1..940dbe9c7956 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz;
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 BDEPEND="virtual/pkgconfig"
 



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2023-02-22 Thread Matt Turner
commit: 0649635bd80f46c03184970ee00ec7868f2f5fe4
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Feb 22 04:40:16 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Feb 22 14:29:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0649635b

x11-misc/xorg-cf-files: Version bump to 1.0.8

Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/xorg-cf-files/Manifest   |  1 +
 x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild | 37 +++
 2 files changed, 38 insertions(+)

diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 671593617e28..f52e87655faf 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,2 +1,3 @@
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 
219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10
 SHA512 
159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.7.tar.bz2 345575 BLAKE2B 
62ca33673b65cccb4c33c9bc138fac768862d3fd2a8e35d875b4a7af7938df3a2d1437bcb9661c8b84c69a73f60e5ae4a2bf58a003987dcd9293a3a948c97531
 SHA512 
0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e
+DIST xorg-cf-files-1.0.8.tar.xz 290280 BLAKE2B 
b822839f2effa091d7e60aa82e0356dc6770116566d9c78a6c0915b8f9e89eb4a3bf78a3bd5380607b3b3e4c1670fb1c6ef0b3ac8ca342cfc1ef141a925c927d
 SHA512 
cc633af889cd82346c3098df9185245c21aa9db7484343f8be9719f6e0b1fc0a9b09afb13b9b864668aa51944f2da797bbe896c807f629e89fc91506e6e63fb9

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
new file mode 100644
index ..14f2f7efe1b1
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Old Imake-related build files"
+HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf;
+SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="virtual/pkgconfig"
+
+src_install() {
+   default
+   echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \
+   "${ED}"/usr/$(get_libdir)/X11/config/host.def || die
+   sed -i -e "s|LibDirName *lib$|LibDirName $(get_libdir)|" \
+   "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed 
libdir sed"
+   sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir 
Concat(ProjectRoot,/$(get_libdir)/X11)|" \
+   "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
libdir sed"
+   sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" \
+   "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
etcx11dir sed"
+   sed -i -e "/#  define Solaris64bitSubdir/d" \
+   "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
+   sed -i -e 's/-DNOSTDHDRS//g' \
+   "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
+
+   sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" 
\
+   "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
+   sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir 
/usr/$(get_libdir)|" \
+   "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
+   sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir 
/usr/$(get_libdir)|" \
+   "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
+}



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2022-10-17 Thread Matt Turner
commit: 6a2f93b6ded318cc62177626feb3378ad400bde1
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Oct 18 00:52:32 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Oct 18 00:56:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a2f93b6

x11-misc/xorg-cf-files: Set remote-id

Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/xorg-cf-files/metadata.xml | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/x11-misc/xorg-cf-files/metadata.xml 
b/x11-misc/xorg-cf-files/metadata.xml
index e17a5bccb78b..dc313ef53879 100644
--- a/x11-misc/xorg-cf-files/metadata.xml
+++ b/x11-misc/xorg-cf-files/metadata.xml
@@ -1,8 +1,11 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   x...@gentoo.org
-   X11
-
+  
+x...@gentoo.org
+X11
+  
+  
+xorg/util/cf
+  
 



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2022-05-25 Thread WANG Xuerui
commit: 7741aba4188b5e66b4f41c59051a7575263d8aad
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu May 26 04:03:55 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu May 26 04:44:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7741aba4

x11-misc/xorg-cf-files: keyword 1.0.7-r1 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
index b562cc67023d..4d120a0e40a1 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 BDEPEND="
virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/, x11-misc/xorg-cf-files/files/

2021-11-17 Thread Matt Turner
commit: cc4b13f77d5860810ef74e47c09e70056a60c9f2
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Nov 18 07:46:01 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Nov 18 07:46:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc4b13f7

x11-misc/xorg-cf-files: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/xorg-cf-files/Manifest|  1 -
 .../files/xorg-cf-files-1.0.6-no-ar-l.patch| 20 
 .../xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild| 57 --
 x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild  | 45 -
 4 files changed, 123 deletions(-)

diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index c4bcd8556547..671593617e28 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,3 +1,2 @@
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 
219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10
 SHA512 
159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
-DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B 
aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26
 SHA512 
1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
 DIST xorg-cf-files-1.0.7.tar.bz2 345575 BLAKE2B 
62ca33673b65cccb4c33c9bc138fac768862d3fd2a8e35d875b4a7af7938df3a2d1437bcb9661c8b84c69a73f60e5ae4a2bf58a003987dcd9293a3a948c97531
 SHA512 
0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e

diff --git a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch 
b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch
deleted file mode 100644
index 52e07f319544..
--- a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.6-no-ar-l.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-l argument was formerly ignored by binutils, but since 2.36 is used
-for something other than what was intended here (tmp files location).
-https://bugs.gentoo.org/782514
 a/Imake.tmpl
-+++ b/Imake.tmpl
-@@ -1083,3 +1083,3 @@
- #else
--#define ArCmd ArCmdBase clq
-+#define ArCmd ArCmdBase cq
- #endif
-@@ -1090,3 +1090,3 @@
- #else
--#define ArAddCmd ArCmdBase rul
-+#define ArAddCmd ArCmdBase ru
- #endif
-@@ -1097,3 +1097,3 @@
- #else
--#define ArExtCmd ArCmdBase xl
-+#define ArExtCmd ArCmdBase x
- #endif

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
deleted file mode 100644
index 5ac95d9db225..
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Old Imake-related build files"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf;
-SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
-   
https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
-IUSE=""
-
-BDEPEND="
-   virtual/pkgconfig
-   app-arch/bzip2
-"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-no-ar-l.patch
-   "${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch
-)
-
-src_configure() {
-   local econfargs=(
-   --disable-selective-werror
-   )
-
-   econf "${econfargs[@]}"
-}
-
-src_install() {
-   default
-   echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \
-   "${ED}"/usr/$(get_libdir)/X11/config/host.def || die
-   sed -i -e "s|LibDirName *lib$|LibDirName $(get_libdir)|" \
-   "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed 
libdir sed"
-   sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir 
Concat(ProjectRoot,/$(get_libdir)/X11)|" \
-   "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
libdir sed"
-   sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" \
-   "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
etcx11dir sed"
-   sed -i -e "/#  define Solaris64bitSubdir/d" \
-   "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
-   sed -i -e 's/-DNOSTDHDRS//g' \
-   "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
-
-   sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" 
\
-   "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir 

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2021-11-17 Thread Georgy Yakovlev
commit: 67485ec66d2f959ba451e5f1d6d637d9f3a8f030
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Nov 17 21:24:50 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Nov 17 22:54:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67485ec6

x11-misc/xorg-cf-files: Stabilize 1.0.7-r1 ppc64, #822339

Signed-off-by: Georgy Yakovlev  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
index 747915cb496b..b562cc67023d 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 BDEPEND="
virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2021-11-17 Thread Arthur Zamarin
commit: d4070d3c277cfd36c6700c08c4115b9b3143343b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Nov 17 16:51:07 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Nov 17 16:51:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4070d3c

x11-misc/xorg-cf-files: Stabilize 1.0.7-r1 ppc, #822339

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
index 4641ad9bc210..747915cb496b 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 BDEPEND="
virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2021-11-16 Thread Sam James
commit: 3e2b04ed7bd813a5c0286393af5b4f4afdee5def
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov 17 07:47:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 17 07:48:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2b04ed

x11-misc/xorg-cf-files: Stabilize 1.0.7-r1 arm64, #822339

Signed-off-by: Sam James  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
index 120f7eb31fd8..4641ad9bc210 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 BDEPEND="
virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2021-11-15 Thread Jakov Smolić
commit: a0bff64aa3b11241d925937fd9615be69bc3e17e
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Nov 15 08:38:05 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Nov 15 08:38:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0bff64a

x11-misc/xorg-cf-files: Stabilize 1.0.7-r1 x86, #822339

Signed-off-by: Jakov Smolić  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
index 4534b413383e..120f7eb31fd8 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 BDEPEND="
virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2021-11-14 Thread Sam James
commit: 326cd4d24e53629dcb0f18dda371cb88df3e0366
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 15 01:12:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 15 01:12:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326cd4d2

x11-misc/xorg-cf-files: Stabilize 1.0.7-r1 arm, #822339

Signed-off-by: Sam James  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
index e975dcc5e261..4534b413383e 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 BDEPEND="
virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2021-11-12 Thread Sam James
commit: 02e76664f4894c2e07783eedacbcff962f390857
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Nov 10 21:26:07 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 12 20:51:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e76664

x11-misc/xorg-cf-files: stable 1.0.7-r1 for sparc, bug #822339

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
index 529a9474c56..e975dcc5e26 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 BDEPEND="
virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2021-11-07 Thread Jakov Smolić
commit: 64c71b24029877fca84d83a17636d25a148e1203
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Nov  7 22:10:27 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Nov  7 22:10:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64c71b24

x11-misc/xorg-cf-files: Stabilize 1.0.7-r1 amd64, #822339

Signed-off-by: Jakov Smolić  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
index 0c86ae1b159..529a9474c56 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 
 BDEPEND="
virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/files/, x11-misc/xorg-cf-files/

2021-08-10 Thread Marek Szuba
commit: c21168e7901475574942701c381d8160f303a5b4
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Aug 10 15:45:02 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Aug 10 16:00:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c21168e7

x11-misc/xorg-cf-files: add support for riscv

While both this package itself and x11-misc/imake emerge fine on riscv
without this patch, the installed .cf files are useless for native
RISC-V builds.

Bug: https://bugs.gentoo.org/807232
Signed-off-by: Marek Szuba  gentoo.org>

 .../files/xorg-cf-files-1.0.7-linux-riscv.patch| 56 ++
 .../xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild| 46 ++
 2 files changed, 102 insertions(+)

diff --git a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.7-linux-riscv.patch 
b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.7-linux-riscv.patch
new file mode 100644
index 000..143aa53a028
--- /dev/null
+++ b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.7-linux-riscv.patch
@@ -0,0 +1,56 @@
+--- a/Imake.cf
 b/Imake.cf
+@@ -1037,6 +1037,17 @@
+ #   define AArch64Architecture
+ #   undef __aarch64__
+ # endif
++# if defined(__riscv)
++#   undef __riscv
++#   if __riscv_xlen == 64
++# undef __riscv_xlen
++# define RV64Architecture
++#   endif
++#   if __riscv_xlen == 32
++# undef __riscv_xlen
++# define RV32Architecture
++#   endif
++# endif
+ #endif /* linux || __GLIBC__ */
+ 
+ #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || 
defined(__i386__) || defined(__x86__) || defined(__powerpc__) || 
defined(__sparc__) || defined(sparc))
+--- a/linux.cf
 b/linux.cf
+@@ -584,7 +584,7 @@
+ #define MkdirHierCmd  mkdir -p
+ 
+ #ifndef HaveLib64
+-# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined 
(Ppc64Architecture) || defined (AArch64Architecture)
++# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined 
(Ppc64Architecture) || defined (AArch64Architecture) || defined 
(RV64Architecture)
+ #  define HaveLib64   YES
+ # else
+ #  define HaveLib64   NO
+@@ -1000,6 +1000,24 @@
+ # define ServerExtraDefines-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+ #endif /* AArch64Architecture */
+ 
++#ifdef RV64Architecture
++# ifndef OptimizedCDebugFlags
++#  define OptimizedCDebugFlags -O2 GccAliasingArgs
++# endif
++# define LinuxMachineDefines  -D__riscv -D__riscv_xlen=64
++# define ServerOSDefines  XFree86ServerOSDefines -DDDXTIME
++# define ServerExtraDefines   -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
++#endif /* RV64Architecture */
++
++#ifdef RV32Architecture
++# ifndef OptimizedCDebugFlags
++#  define OptimizedCDebugFlags -O2 GccAliasingArgs
++# endif
++# define LinuxMachineDefines  -D__riscv -D__riscv_xlen=32
++# define ServerOSDefines  XFree86ServerOSDefines -DDDXTIME
++# define ServerExtraDefines   -DGCCUSESGAS XFree86ServerDefines
++#endif /* RV32Architecture */
++
+ #ifndef StandardDefines
+ # ifdef __linux__
+ #  define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
new file mode 100644
index 000..0c86ae1b159
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Old Imake-related build files"
+HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf;
+SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
+   
https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+
+BDEPEND="
+   virtual/pkgconfig
+   app-arch/bzip2
+"
+
+PATCHES=(
+   "${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch
+   "${FILESDIR}"/${PN}-1.0.7-linux-riscv.patch
+)
+
+src_install() {
+   default
+   echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \
+   "${ED}"/usr/$(get_libdir)/X11/config/host.def || die
+   sed -i -e "s|LibDirName *lib$|LibDirName $(get_libdir)|" \
+   "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed 
libdir sed"
+   sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir 
Concat(ProjectRoot,/$(get_libdir)/X11)|" \
+   "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
libdir sed"
+   sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" \
+   "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
etcx11dir sed"
+   sed -i -e "/#  define Solaris64bitSubdir/d" \
+   "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
+   sed -i -e 

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2021-08-10 Thread Marek Szuba
commit: 2dcc8aaaf06ad9364679448c3dcd5404ccde66b8
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Aug 10 15:48:29 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Aug 10 16:00:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dcc8aaa

x11-misc/xorg-cf-files: unkeyword <1.0.7-r1 for ~riscv

They do not really support this arch, see the previous commit.

Bug: https://bugs.gentoo.org/807232
Signed-off-by: Marek Szuba  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild | 2 +-
 x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
index 728aed4cf89..5ac95d9db22 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
 IUSE=""
 
 BDEPEND="

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild
index e4264f2a2f4..55cb574d3ba 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
 
 BDEPEND="
virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2021-08-01 Thread Matt Turner
commit: 8be05b72e722873c0d7f6ad243501513c9d58e1b
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Aug  2 04:01:37 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Aug  2 04:10:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8be05b72

x11-misc/xorg-cf-files: Version bump to 1.0.7

Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/xorg-cf-files/Manifest   |  1 +
 x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild | 45 +++
 2 files changed, 46 insertions(+)

diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 7b8dc93bc73..c4bcd855654 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,2 +1,3 @@
 DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 
219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10
 SHA512 
159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B 
aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26
 SHA512 
1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
+DIST xorg-cf-files-1.0.7.tar.bz2 345575 BLAKE2B 
62ca33673b65cccb4c33c9bc138fac768862d3fd2a8e35d875b4a7af7938df3a2d1437bcb9661c8b84c69a73f60e5ae4a2bf58a003987dcd9293a3a948c97531
 SHA512 
0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild
new file mode 100644
index 000..e4264f2a2f4
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Old Imake-related build files"
+HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf;
+SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
+   
https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+
+BDEPEND="
+   virtual/pkgconfig
+   app-arch/bzip2
+"
+
+PATCHES=(
+   "${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch
+)
+
+src_install() {
+   default
+   echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \
+   "${ED}"/usr/$(get_libdir)/X11/config/host.def || die
+   sed -i -e "s|LibDirName *lib$|LibDirName $(get_libdir)|" \
+   "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed 
libdir sed"
+   sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir 
Concat(ProjectRoot,/$(get_libdir)/X11)|" \
+   "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
libdir sed"
+   sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" \
+   "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
etcx11dir sed"
+   sed -i -e "/#  define Solaris64bitSubdir/d" \
+   "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
+   sed -i -e 's/-DNOSTDHDRS//g' \
+   "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
+
+   sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" 
\
+   "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
+   sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir 
/usr/$(get_libdir)|" \
+   "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
+   sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir 
/usr/$(get_libdir)|" \
+   "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
+}



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2021-05-25 Thread Yixun Lan
commit: c61baa2b556af1b5cf34a0bbf8c0886ef5a5f9f8
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue May 25 02:36:19 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue May 25 08:24:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61baa2b

x11-misc/xorg-cf-files: add riscv keyword

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Yixun Lan  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
index 5ac95d9db22..728aed4cf89 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2021-05-25 Thread Yixun Lan
commit: d859320aa840dfea6974ffb13443441bf45a294e
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue May 25 02:35:26 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue May 25 08:24:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d859320a

x11-misc/xorg-cf-files: fix build err on ARCH=riscv

this due to $(get_libdir) expand to 'lib64/lp64d'
no actual functional change added

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Yixun Lan  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
index c44c96e2fa9..5ac95d9db22 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
@@ -37,7 +37,7 @@ src_install() {
default
echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \
"${ED}"/usr/$(get_libdir)/X11/config/host.def || die
-   sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" \
+   sed -i -e "s|LibDirName *lib$|LibDirName $(get_libdir)|" \
"${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed 
libdir sed"
sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir 
Concat(ProjectRoot,/$(get_libdir)/X11)|" \
"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
libdir sed"



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2021-04-05 Thread Sam James
commit: c43e137fe3b3c2d7dc79ef54f4845ffb467e7c42
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr  5 20:51:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr  5 22:18:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c43e137f

x11-misc/xorg-cf-files: drop s390 to ~s390 (unstable)

Signed-off-by: Sam James  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index c1a023f830c..b674d2cf2e0 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
 IUSE=""
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2021-01-06 Thread Fabian Groffen
commit: f7445fde936ccd3c5c061c1ec4b9fb602da96f85
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 12:05:16 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 12:05:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7445fde

x11-misc/xorg-cf-files: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 12a31b976db..c1a023f830c 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ 
SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
 IUSE=""
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2020-02-01 Thread Matt Turner
commit: 7e453c034a48aea5d0a335a7622f200bc8090b0a
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Feb  2 00:14:11 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Feb  2 00:14:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e453c03

x11-misc/xorg-cf-files: Remove unnecessary strip-slash

Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 82c580779fc..f8abfd30074 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -34,13 +34,13 @@ src_configure() {
 
 src_install() {
default
-   echo "#define ManDirectoryRoot ${EPREFIX%/}/usr/share/man" >> \
+   echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \
"${ED}"/usr/$(get_libdir)/X11/config/host.def || die
sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" \
"${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed 
libdir sed"
sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir 
Concat(ProjectRoot,/$(get_libdir)/X11)|" \
"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
libdir sed"
-   sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX%/}\2|" \
+   sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" \
"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
etcx11dir sed"
sed -i -e "/#  define Solaris64bitSubdir/d" \
"${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2019-10-02 Thread Michał Górny
commit: 98048ca49241a66d2131a9bd2ad388b55bd284ca
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Sep 30 11:02:25 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Oct  3 05:53:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98048ca4

x11-misc/xorg-cf-files: Inline mirror://xorg

Signed-off-by: Michał Górny  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 8f1985d5f80..20085e5fd1b 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Old Imake-related build files"
 HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/cf;
-SRC_URI="mirror://xorg/util/${P}.tar.bz2
+SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2

https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2;
 
 LICENSE="MIT"



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2019-07-28 Thread Matt Turner
commit: 40d39cd5790452bf92d47c7c08524215330628cd
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jul 28 19:06:34 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jul 28 19:09:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40d39cd5

x11-misc/xorg-cf-files: Drop unnecessary ED slash strips

Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 22e8a389248..8f1985d5f80 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -35,22 +35,22 @@ src_configure() {
 src_install() {
default
echo "#define ManDirectoryRoot ${EPREFIX%/}/usr/share/man" >> \
-   "${ED%/}"/usr/$(get_libdir)/X11/config/host.def || die
+   "${ED}"/usr/$(get_libdir)/X11/config/host.def || die
sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" \
-   "${ED%/}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die 
"failed libdir sed"
+   "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed 
libdir sed"
sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir 
Concat(ProjectRoot,/$(get_libdir)/X11)|" \
-   "${ED%/}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
libdir sed"
+   "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
libdir sed"
sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX%/}\2|" \
-   "${ED%/}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
etcx11dir sed"
+   "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
etcx11dir sed"
sed -i -e "/#  define Solaris64bitSubdir/d" \
-   "${ED%/}"/usr/$(get_libdir)/X11/config/sun.cf || die
+   "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
sed -i -e 's/-DNOSTDHDRS//g' \
-   "${ED%/}"/usr/$(get_libdir)/X11/config/sun.cf || die
+   "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
 
sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" 
\
-   "${ED%/}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
+   "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir 
/usr/$(get_libdir)|" \
-   "${ED%/}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
+   "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir 
/usr/$(get_libdir)|" \
-   "${ED%/}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
+   "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
 }



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2019-05-14 Thread Aaron Bauman
commit: fbcc03b9c453d2c2b7685413b022501c97c1c1f7
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed May 15 01:03:59 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed May 15 01:04:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbcc03b9

x11-misc/xorg-cf-files: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 2d2c29ce331..22e8a389248 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2018-12-31 Thread Mikle Kolyada
commit: 3a9ba20b3c54710b9dca52291e0c792269b5ae14
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Dec 31 09:51:20 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Dec 31 10:06:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a9ba20b

x11-misc/xorg-cf-files: mark s390 stable

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 3f17605c8b8..2184e9dd391 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2018-11-28 Thread Matt Turner
commit: c1a35927e55680ba0bc18694aa841cf7e239a395
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Nov 29 05:15:25 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Nov 29 05:17:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1a35927

x11-misc/xorg-cf-files: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 32 ---
 1 file changed, 32 deletions(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
deleted file mode 100644
index 6c6d7152945..000
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Old Imake-related build files"
-SRC_URI+=" 
https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2;
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch
-)
-
-src_install() {
-   xorg-2_src_install
-   echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> 
"${ED}"/usr/$(get_libdir)/X11/config/host.def || die
-   sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" 
"${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
-   sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir 
Concat(ProjectRoot,/$(get_libdir)/X11)|" 
"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
-   sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" 
"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
-   sed -i -e "/#  define Solaris64bitSubdir/d" 
"${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
-   sed -i -e 's/-DNOSTDHDRS//g' 
"${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
-
-   sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" 
"${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
-   sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir 
/usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die 
"failed libdir sed"
-   sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir 
/usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die 
"failed libdir sed"
-}



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2018-11-28 Thread Matt Turner
commit: 1aeed40f308169aba241317b3e7468f641085d8d
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Nov 29 05:04:50 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Nov 29 05:17:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aeed40f

x11-misc/xorg-cf-files-1.0.6-r1: hppa stable, bug 668900

Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index af999d6892d..3f17605c8b8 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2018-11-27 Thread Matt Turner
commit: c2037dd8d3bf65959f81863a0a2d3c778b4c14ef
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Nov 27 20:29:51 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Nov 27 20:30:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2037dd8

x11-misc/xorg-cf-files-1.0.6-r1: ia64 stable, bug 668900

Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 2dda467e5bf..af999d6892d 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2018-11-17 Thread Mikle Kolyada
commit: 5fbef60f23e46702ef178fef6f2d139e016be5e6
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Nov 17 14:56:15 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Nov 17 14:56:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fbef60f

x11-misc/xorg-cf-files: amd64 stable wrt bug #668900

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index e70870e3ce9..2dda467e5bf 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2018-11-10 Thread Matt Turner
commit: bf1f890ad09148e18c4c381d0b3c416a015b33ef
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Nov 10 17:23:00 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Nov 10 17:23:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf1f890a

x11-misc/xorg-cf-files-1.0.6-r1: alpha stable, bug 668900

Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 4e0917b0ac5..e70870e3ce9 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2018-11-04 Thread Thomas Deutschmann
commit: 0de6e8b4ad7756cbf9b037b1ba9e216ab538cc5b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Nov  4 18:59:22 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Nov  4 19:13:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de6e8b4

x11-misc/xorg-cf-files: x86 stable (bug #668900)

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 9c90f05c3b7..4e0917b0ac5 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2018-11-04 Thread Sergei Trofimovich
commit: d3befdae12a9fcd51590a550f2a1613ee38fce30
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Nov  4 11:20:25 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov  4 14:15:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3befdae

x11-misc/xorg-cf-files: stable 1.0.6-r1 for sparc, bug #668900

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index bf1bcffd3fe..9c90f05c3b7 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2018-11-03 Thread Matt Turner
commit: a840ac960d707c79ebbc0cb8e5b15674c675c68e
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Nov  4 04:35:01 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Nov  4 04:35:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a840ac96

x11-misc/xorg-cf-files-1.0.6-r1: ppc64 stable, bug 668900

Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 19b5edf2fc6..bf1bcffd3fe 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2018-11-03 Thread Matt Turner
commit: 294913e8c90691bd5aecc6c2579a4d76a1c72df6
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Nov  4 04:34:43 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Nov  4 04:34:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=294913e8

x11-misc/xorg-cf-files-1.0.6-r1: ppc stable, bug 668900

Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index 3c3678f715b..19b5edf2fc6 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2018-11-03 Thread Mikle Kolyada
commit: 3ac3306c584f75a2768a95640cf5d18149f7679a
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Nov  3 14:41:02 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Nov  3 14:41:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac3306c

x11-misc/xorg-cf-files: amd64 stable wrt bug #668900

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
index a23c241bdd8..3c3678f715b 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2018-07-27 Thread Matt Turner
commit: 972db3fd658d8a705005e615017c530fa6c55dd7
Author: Marty E. Plummer  startmail  com>
AuthorDate: Fri Jul 27 23:30:54 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Jul 28 00:38:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972db3fd

x11-misc/xorg-cf-files: adjust patch to be -p1 applicable

In order to be shareable between -r0 and -r1.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 x11-misc/xorg-cf-files/Manifest   | 2 +-
 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 27f100a1a0d..7b8dc93bc73 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,2 +1,2 @@
-DIST xorg-cf-files-1.0.2-solaris-prefix.patch.bz2 4423 BLAKE2B 
f30d628d65db851f2cad14e2806ce4fb9114b0ddac6f21d589ad592936c5fe633f19e7ccbe027ec079f2811e549e1fcd5606c573acedb5034d3bb18e1f6c7daf
 SHA512 
61ba3dea5ce33c1bbcb7a7a9b53f1558ad71b818eaafb1bdbc38da8ff9ff231a824d4b6cbc59e6ddd422a2a74e88eec201471c8e630b9b447fba519973ddfdf6
+DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 
219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10
 SHA512 
159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B 
aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26
 SHA512 
1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index 2c4b306c33d..76edd0242ac 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Old Imake-related build files"
-SRC_URI+=" 
https://dev.gentoo.org/~mgorny/dist/${PN}-1.0.2-solaris-prefix.patch.bz2;
+SRC_URI+=" 
https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2;
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
@@ -14,7 +14,7 @@ RDEPEND=""
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-   "${WORKDIR}"/${PN}-1.0.2-solaris-prefix.patch
+   "${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch
 )
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2018-07-27 Thread Matt Turner
commit: 30e1117f8b6bf64711572d5539fa4f9d61b8a5c9
Author: Marty E. Plummer  startmail  com>
AuthorDate: Fri Jul 27 23:32:15 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Jul 28 00:38:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e1117f

x11-misc/xorg-cf-files: port to EAPI 7

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 .../xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild| 56 ++
 1 file changed, 56 insertions(+)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
new file mode 100644
index 000..0ea092a0e0b
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Old Imake-related build files"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/;
+SRC_URI="mirror://xorg/util/${P}.tar.bz2
+   
https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+BDEPEND="
+   virtual/pkgconfig
+   app-arch/bzip2
+"
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch
+)
+
+src_configure() {
+   local econfargs=(
+   --disable-selective-werror
+   )
+
+   econf "${econfargs[@]}"
+}
+
+src_install() {
+   default
+   echo "#define ManDirectoryRoot ${EPREFIX%/}/usr/share/man" >> \
+   "${ED%/}"/usr/$(get_libdir)/X11/config/host.def || die
+   sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" \
+   "${ED%/}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die 
"failed libdir sed"
+   sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir 
Concat(ProjectRoot,/$(get_libdir)/X11)|" \
+   "${ED%/}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
libdir sed"
+   sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX%/}\2|" \
+   "${ED%/}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed 
etcx11dir sed"
+   sed -i -e "/#  define Solaris64bitSubdir/d" \
+   "${ED%/}"/usr/$(get_libdir)/X11/config/sun.cf || die
+   sed -i -e 's/-DNOSTDHDRS//g' \
+   "${ED%/}"/usr/$(get_libdir)/X11/config/sun.cf || die
+
+   sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" 
\
+   "${ED%/}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
+   sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir 
/usr/$(get_libdir)|" \
+   "${ED%/}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
+   sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir 
/usr/$(get_libdir)|" \
+   "${ED%/}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed 
libdir sed"
+}



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2018-07-21 Thread Mikle Kolyada
commit: 0304905e427827118926a21773857afa4a3fefe2
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jul 21 17:20:27 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jul 21 17:20:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0304905e

x11-misc/xorg-cf-files: mark s390 stable

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index d01b7a6fd29..2c4b306c33d 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="Old Imake-related build files"
 SRC_URI+=" 
https://dev.gentoo.org/~mgorny/dist/${PN}-1.0.2-solaris-prefix.patch.bz2;
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/files/, x11-misc/xorg-cf-files/

2017-12-11 Thread Michał Górny
commit: c3338f8d8c84c2a4680795b997558be23a4abc00
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Dec 11 19:55:29 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Dec 11 19:57:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3338f8d

x11-misc/xorg-cf-files: [QA] Move big patch to a distfile

Closes: https://bugs.gentoo.org/620646

 x11-misc/xorg-cf-files/Manifest|   1 +
 .../files/xorg-cf-files-1.0.2-solaris-prefix.patch | 663 -
 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild  |   3 +-
 3 files changed, 3 insertions(+), 664 deletions(-)

diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 8e03f6154fd..27f100a1a0d 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1 +1,2 @@
+DIST xorg-cf-files-1.0.2-solaris-prefix.patch.bz2 4423 BLAKE2B 
f30d628d65db851f2cad14e2806ce4fb9114b0ddac6f21d589ad592936c5fe633f19e7ccbe027ec079f2811e549e1fcd5606c573acedb5034d3bb18e1f6c7daf
 SHA512 
61ba3dea5ce33c1bbcb7a7a9b53f1558ad71b818eaafb1bdbc38da8ff9ff231a824d4b6cbc59e6ddd422a2a74e88eec201471c8e630b9b447fba519973ddfdf6
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B 
aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26
 SHA512 
1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa

diff --git 
a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.2-solaris-prefix.patch 
b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.2-solaris-prefix.patch
deleted file mode 100644
index b797b2588d1..000
--- a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.2-solaris-prefix.patch
+++ /dev/null
@@ -1,663 +0,0 @@
 sunLib.rules.orig  2008-12-18 13:43:19.032933408 +0100
-+++ sunLib.rules   2008-12-18 13:51:12.494555406 +0100
-@@ -7,127 +7,268 @@
- XCOMM $XFree86: xc/config/cf/sunLib.rules,v 1.3 2001/01/17 16:38:49 dawes Exp 
$
- 
- #ifndef HasSharedLibraries
--#define HasSharedLibraries YES
-+# define HasSharedLibraries YES
- #endif
--#ifndef SharedDataSeparation
--#define SharedDataSeparation YES
-+#ifndef ForceNormalLib
-+# define ForceNormalLib NO
- #endif
--#ifndef SharedCodeDef
--#define SharedCodeDef -DSHAREDCODE
--#endif
--#ifndef SharedLibraryDef
--#define SharedLibraryDef -DSUNSHLIB
--#endif
--#ifndef ShLibIncludeFile
--#define ShLibIncludeFile 
--#endif
--#ifndef SharedLibraryLoadFlags
--#define SharedLibraryLoadFlags -assert pure-text
--#endif
--#ifndef PositionIndependentCFlags
--#if HasGcc2
--#define PositionIndependentCFlags -fPIC
--#else
--#define PositionIndependentCFlags -pic
-+
-+#ifndef UseRpath
-+#define UseRpath NO
- #endif
-+
-+#ifndef SharedOldX
-+# define SharedOldX NO
- #endif
--#ifndef PositionIndependentCplusplusFlags
--#if HasGcc2ForCplusplus
--#define PositionIndependentCplusplusFlags -fPIC
-+# ifndef SharedDataSeparation
-+#  define SharedDataSeparation NO
-+# endif
-+# ifndef SharedCodeDef
-+#  define SharedCodeDef /**/
-+# endif
-+# ifndef SharedLibraryDef
-+#  define SharedLibraryDef /**/
-+# endif
-+# ifndef ShLibIncludeFile
-+#  define ShLibIncludeFile 
-+# endif
-+#ifndef RpathLoadFlags
-+#if UseRpath
-+#define RpathLoadFlags -R$(USRLIBDIRPATH)
- #else
--#define PositionIndependentCplusplusFlags -pic
-+#define RpathLoadFlags /**/
- #endif
- #endif
--
--/*
-- * SharedDSLibDependencies - shared library dependencies with data separation
-- */
--#ifndef SharedDSLibDependencies
--#define SharedDSLibDependencies(libname,libsource,revname) 
_UseCat($(USRLIBDIR)/lib,libsource/lib,libname.sa.$(revname))
-+#ifndef LibraryRpathLoadFlags
-+#define LibraryRpathLoadFlags RpathLoadFlags
- #endif
-+# ifndef SharedLibraryLoadFlags
-+#  define SharedLibraryLoadFlags -shared
-+# endif
-+# ifndef PositionIndependentCFlags
-+#  define PositionIndependentCFlags -fPIC
-+# endif
-+# ifndef PositionIndependentCplusplusFlags
-+#  define PositionIndependentCplusplusFlags -fPIC
-+# endif
-+# ifndef ExtraLoadFlags
-+#  if LinuxBinUtilsMajorVersion >= 26
-+#   ifdef UseInstalled
-+#if LinuxBinUtilsMajorVersion < 27
-+# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(USRLIBDIRPATH)
-+#endif
-+#   else
-+#define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
-+#   endif
-+#  else
-+#   define ExtraLoadFlags RpathLoadFlags
-+#  endif
-+# endif
-+# ifndef HardCodeLibdirFlag
-+#  define HardCodeLibdirFlag RpathLoadFlags
-+# endif
-+# if !defined(ShlibGlobalsFlags)
-+#  define ShlibGlobalsFlags -Wl,-Bsymbolic
-+# endif
- 
- /*
-  * InstallSharedLibrary - generate rules to install the shared library.
-+ * NOTE: file must be executable, hence "INSTBINFLAGS"
-  */
--#ifndef InstallSharedLibrary
--#define   InstallSharedLibrary(libname,rev,dest)  
@@\
--InstallTarget(install,Concat(lib,libname.so.rev),$(INSTLIBFLAGS),dest)
--#endif /* InstallSharedLibrary */

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2017-03-07 Thread David Seifert
commit: 15b2b0e21b00a3011c182668be3d7beaf4107e91
Author: Harri Nieminen  gmail  com>
AuthorDate: Mon Mar  6 15:22:31 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Mar  7 09:12:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b2b0e2

x11-misc/xorg-cf-files: Remove old

Package-Manager: Portage-2.3.4, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4142

 x11-misc/xorg-cf-files/Manifest   |  1 -
 x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild | 31 ---
 2 files changed, 32 deletions(-)

diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 8487f5e82b5..358fb4986a6 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,2 +1 @@
-DIST xorg-cf-files-1.0.5.tar.bz2 377835 SHA256 
ed23b85043edecc38fad4229e0ebdb7ff80b570e746bc03a7c8678d601be7ed4 SHA512 
139d2c51538257eac79118ea367cdfbebebcd095f353e784b61c109e008bf8e43eb4ef15bb0c8df74339dbed9d96af4c4d1e023c23d02d5de31dc2ea5b85ce5c
 WHIRLPOOL 
8621de9d25a9672d30d9ee3ed6a617e9c9e9d5a34c945fa458b0318b9bf157569f97ea1697efc463f3bb0ae8c6d0335dd30a6b5499c6baf00c5e172aaa5bf95b
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 SHA256 
4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d SHA512 
1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
 WHIRLPOOL 
ef7d0581bd2d36ba61ccd47d7928dff43839494252af37350582cbab7ca3740cecb7a0d2c913aeb73fafeef1cbde7e2daf7ca9425dad6a6a29dd922dc80d7c97

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild
deleted file mode 100644
index 580d8ecca5f..000
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit xorg-2
-
-DESCRIPTION="Old Imake-related build files"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch
-)
-
-src_install() {
-   xorg-2_src_install
-   echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> 
"${ED}"/usr/$(get_libdir)/X11/config/host.def
-   sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" 
"${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
-   sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir 
Concat(ProjectRoot,/$(get_libdir)/X11)|" 
"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
-   sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" 
"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
-   sed -i -e "/#  define Solaris64bitSubdir/d" 
"${ED}"/usr/$(get_libdir)/X11/config/sun.cf
-   sed -i -e 's/-DNOSTDHDRS//g' "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
-
-   sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" 
"${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
-   sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir 
/usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die 
"failed libdir sed"
-   sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir 
/usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die 
"failed libdir sed"
-}



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2017-01-25 Thread Agostino Sarubbo
commit: 9ef524be43a57428bcd2a4f1e1757651b77ed993
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jan 25 12:27:46 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jan 25 12:27:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ef524be

x11-misc/xorg-cf-files: ppc64 stable wrt bug #579266

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index 96bbc31..381d38b 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Old Imake-related build files"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2017-01-22 Thread Agostino Sarubbo
commit: 6307a84418a9d73f7d71213a53de37480a764625
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jan 22 17:20:11 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jan 22 17:20:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6307a844

x11-misc/xorg-cf-files: sparc stable wrt bug #579266

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index 1bd1d9e..96bbc31 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,7 +7,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Old Imake-related build files"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2016-11-17 Thread Agostino Sarubbo
commit: 466c62f14dc4a9d986d00bc7ddb4c35da5e0e9ab
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Nov 17 10:48:07 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Nov 17 10:48:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=466c62f1

x11-misc/xorg-cf-files: ppc stable wrt bug #579266

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index 29fab04..1bd1d9e 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Old Imake-related build files"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2016-11-16 Thread Agostino Sarubbo
commit: dea947fe84c349714244d09fc72931d8ce78eae6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 16 10:43:57 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 16 10:43:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea947fe

x11-misc/xorg-cf-files: ia64 stable wrt bug #579266

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index 1ca45a1..29fab04 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Old Imake-related build files"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2016-09-22 Thread Tobias Klausmann
commit: 3cc764844fa0d5ed408073af3ff1c32b668145b0
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Thu Sep 22 15:54:14 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Thu Sep 22 15:55:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cc76484

x11-misc/xorg-cf-files-1.0.6-r0: add alpha keyword

Gentoo-Bug: 579266

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index 8a14070..1ca45a1 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Old Imake-related build files"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2016-09-17 Thread Pacho Ramos
commit: 444271dcbde17adbaf636fd87a1580c7bd0c887d
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Sep 17 11:11:36 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Sep 17 11:11:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=444271dc

x11-misc/xorg-cf-files: amd64 stable, bug 579266

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index 587f49e..8a14070 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Old Imake-related build files"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
 IUSE=""
 
 RDEPEND=""



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2016-09-17 Thread Pacho Ramos
commit: ec62deae48ee936df195af75b64625d0b688378b
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Sep 17 10:45:51 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Sep 17 10:45:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec62deae

x11-misc/xorg-cf-files: x86 stable, bug 579266

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index fe48ffc..587f49e 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Old Imake-related build files"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
 IUSE=""
 
 RDEPEND=""



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2016-08-06 Thread Markus Meier
commit: ee512ff3d77332f0296b28676bd4abf846a6769e
Author: Markus Meier  gentoo  org>
AuthorDate: Sat Aug  6 11:01:38 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat Aug  6 11:01:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee512ff3

x11-misc/xorg-cf-files: arm stable, bug #579266

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="arm"

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index 0904c39..fe48ffc 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Old Imake-related build files"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
 IUSE=""
 
 RDEPEND=""



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2016-08-02 Thread Jeroen Roovers
commit: dfd11973ac75667126c1b7bffd092dcb512a308a
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Aug  3 04:27:06 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Aug  3 04:32:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfd11973

x11-misc/xorg-cf-files: Stable for HPPA (bug #579266).

Package-Manager: portage-2.3.0
RepoMan-Options: --ignore-arches

 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index a72a36f..0904c39 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,7 +7,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Old Imake-related build files"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
 IUSE=""
 
 RDEPEND=""



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2015-12-22 Thread Manuel Rüger
commit: 3516e28e0d3ed69c1162eea9aab0e9efe5cf60df
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Dec 22 16:10:47 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Dec 22 16:10:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3516e28e

x11-misc/xorg-cf-files: Version bump

Package-Manager: portage-2.2.26

 x11-misc/xorg-cf-files/Manifest   |  1 +
 x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild | 32 +++
 2 files changed, 33 insertions(+)

diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 8c70a67..8487f5e 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1 +1,2 @@
 DIST xorg-cf-files-1.0.5.tar.bz2 377835 SHA256 
ed23b85043edecc38fad4229e0ebdb7ff80b570e746bc03a7c8678d601be7ed4 SHA512 
139d2c51538257eac79118ea367cdfbebebcd095f353e784b61c109e008bf8e43eb4ef15bb0c8df74339dbed9d96af4c4d1e023c23d02d5de31dc2ea5b85ce5c
 WHIRLPOOL 
8621de9d25a9672d30d9ee3ed6a617e9c9e9d5a34c945fa458b0318b9bf157569f97ea1697efc463f3bb0ae8c6d0335dd30a6b5499c6baf00c5e172aaa5bf95b
+DIST xorg-cf-files-1.0.6.tar.bz2 337859 SHA256 
4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d SHA512 
1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
 WHIRLPOOL 
ef7d0581bd2d36ba61ccd47d7928dff43839494252af37350582cbab7ca3740cecb7a0d2c913aeb73fafeef1cbde7e2daf7ca9425dad6a6a29dd922dc80d7c97

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
new file mode 100644
index 000..a72a36f
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Old Imake-related build files"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch
+)
+
+src_install() {
+   xorg-2_src_install
+   echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> 
"${ED}"/usr/$(get_libdir)/X11/config/host.def || die
+   sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" 
"${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
+   sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir 
Concat(ProjectRoot,/$(get_libdir)/X11)|" 
"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
+   sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" 
"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
+   sed -i -e "/#  define Solaris64bitSubdir/d" 
"${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
+   sed -i -e 's/-DNOSTDHDRS//g' 
"${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
+
+   sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" 
"${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+   sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir 
/usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die 
"failed libdir sed"
+   sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir 
/usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die 
"failed libdir sed"
+}



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xorg-cf-files/

2015-09-13 Thread Manuel Rüger
commit: b6b89b7a44d1a2719c52db949cba560b761eeb65
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Sep 13 18:48:12 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Sep 13 18:48:33 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6b89b7a

x11-misc/xorg-cf-files: Remove old

Package-Manager: portage-2.2.20.1

 x11-misc/xorg-cf-files/Manifest|  1 -
 .../xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild| 32 --
 x11-misc/xorg-cf-files/xorg-cf-files-1.0.4.ebuild  | 28 ---
 3 files changed, 61 deletions(-)

diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index af31eca..8c70a67 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,2 +1 @@
-DIST xorg-cf-files-1.0.4.tar.bz2 367380 SHA256 
36e9ce83e4978f59909c6f44c43002d9b240ae66e23984ea1086f0b18c810669 SHA512 
e00ba2273b8ec7ca4ae84c176075170ae74162064463e9b48fb5c6ad62f7984a93fafa626caf0a9079b796f4deec57759a1d0fc148e77793eae130a9441baf42
 WHIRLPOOL 
bee8bd9b8b72e19bf1429aefe86db6b4eed39132e4080f9e3c9a4acb9d6b40e73e5d6dfd75304d29654feaa4c88f64ffd34c097896417ab3285e10090c3915ff
 DIST xorg-cf-files-1.0.5.tar.bz2 377835 SHA256 
ed23b85043edecc38fad4229e0ebdb7ff80b570e746bc03a7c8678d601be7ed4 SHA512 
139d2c51538257eac79118ea367cdfbebebcd095f353e784b61c109e008bf8e43eb4ef15bb0c8df74339dbed9d96af4c4d1e023c23d02d5de31dc2ea5b85ce5c
 WHIRLPOOL 
8621de9d25a9672d30d9ee3ed6a617e9c9e9d5a34c945fa458b0318b9bf157569f97ea1697efc463f3bb0ae8c6d0335dd30a6b5499c6baf00c5e172aaa5bf95b

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild
deleted file mode 100644
index a640f2f..000
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit xorg-2
-
-DESCRIPTION="Old Imake-related build files"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch
-)
-
-src_install() {
-   xorg-2_src_install
-   echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> 
"${ED}"/usr/$(get_libdir)/X11/config/host.def
-   sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" 
"${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
-   sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir 
Concat(ProjectRoot,/$(get_libdir)/X11)|" 
"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
-   sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" 
"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
-   sed -i -e "/#  define Solaris64bitSubdir/d" 
"${ED}"/usr/$(get_libdir)/X11/config/sun.cf
-   sed -i -e 's/-DNOSTDHDRS//g' "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
-
-   sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" 
"${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
-   sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir 
/usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die 
"failed libdir sed"
-   sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir 
/usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die 
"failed libdir sed"
-}

diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4.ebuild 
b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4.ebuild
deleted file mode 100644
index de5f956..000
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="Old Imake-related build files"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 
~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch
-)
-
-src_install() {
-   xorg-2_src_install
-   echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> 
${ED}/usr/$(get_libdir)/X11/config/host.def
-   sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" 
"${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
-   sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir 
Concat(ProjectRoot,/$(get_libdir)/X11)|" 
${ED}/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
-   sed -i -e "s|\(EtcX11Directory