| 1 |
commit: 6bf3dc8251e79a674c8fc399004d05611f4508b3 |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 4 08:11:56 2019 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 4 08:11:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf3dc82 |
| 7 |
|
| 8 |
dev-tcltk/tdom: fix installation |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/699262 |
| 11 |
Package-Manager: Portage-2.3.76, Repoman-2.3.16 |
| 12 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch | 55 ----------------------------- |
| 15 |
dev-tcltk/tdom/files/tdom-0.9.1.patch | 58 ------------------------------- |
| 16 |
dev-tcltk/tdom/tdom-0.9.1.ebuild | 6 ---- |
| 17 |
3 files changed, 119 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch b/dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index 36d844d74cb..00000000000 |
| 22 |
--- a/dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,55 +0,0 @@ |
| 25 |
---- a/extensions/tnc/Makefile.in 2018-10-31 21:18:18.701695694 +0100 |
| 26 |
-+++ b/extensions/tnc/Makefile.in 2018-10-31 21:19:25.621555122 +0100 |
| 27 |
-@@ -372,25 +372,25 @@ |
| 28 |
- #======================================================================== |
| 29 |
- |
| 30 |
- install-lib-binaries: binaries |
| 31 |
-- @$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir) |
| 32 |
-+ @$(INSTALL_DATA_DIR) $(DESTDIR)$(libdir) |
| 33 |
- @list='$(lib_BINARIES)'; for p in $$list; do \ |
| 34 |
- if test -f $$p; then \ |
| 35 |
-- echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ |
| 36 |
-- $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \ |
| 37 |
-+ echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p"; \ |
| 38 |
-+ $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p; \ |
| 39 |
- stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ |
| 40 |
- if test "x$$stub" = "xstub"; then \ |
| 41 |
-- echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ |
| 42 |
-- $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ |
| 43 |
-+ echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \ |
| 44 |
-+ $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \ |
| 45 |
- else \ |
| 46 |
-- echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ |
| 47 |
-- $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ |
| 48 |
-+ echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \ |
| 49 |
-+ $(RANLIB) $(DESTDIR)$(libdir)/$$p; \ |
| 50 |
- fi; \ |
| 51 |
- ext=`echo $$p|sed -e "s/.*\.//"`; \ |
| 52 |
- if test "x$$ext" = "xdll"; then \ |
| 53 |
- lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ |
| 54 |
- if test -f $$lib; then \ |
| 55 |
-- echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \ |
| 56 |
-- $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \ |
| 57 |
-+ echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \ |
| 58 |
-+ $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \ |
| 59 |
- fi; \ |
| 60 |
- fi; \ |
| 61 |
- fi; \ |
| 62 |
-@@ -398,13 +398,13 @@ |
| 63 |
- @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \ |
| 64 |
- if test -f $(srcdir)/$$p; then \ |
| 65 |
- destp=`basename $$p`; \ |
| 66 |
-- echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \ |
| 67 |
-- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \ |
| 68 |
-+ echo " Install $$destp $(DESTDIR)$(libdir)/$$destp"; \ |
| 69 |
-+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(libdir)/$$destp; \ |
| 70 |
- fi; \ |
| 71 |
- done |
| 72 |
- @if test "x$(SHARED_BUILD)" = "x1"; then \ |
| 73 |
-- echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \ |
| 74 |
-- $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \ |
| 75 |
-+ echo " Install pkgIndex.tcl $(DESTDIR)$(libdir)"; \ |
| 76 |
-+ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(libdir); \ |
| 77 |
- fi |
| 78 |
- |
| 79 |
- #======================================================================== |
| 80 |
|
| 81 |
diff --git a/dev-tcltk/tdom/files/tdom-0.9.1.patch b/dev-tcltk/tdom/files/tdom-0.9.1.patch |
| 82 |
deleted file mode 100644 |
| 83 |
index 00d3df2a306..00000000000 |
| 84 |
--- a/dev-tcltk/tdom/files/tdom-0.9.1.patch |
| 85 |
+++ /dev/null |
| 86 |
@@ -1,58 +0,0 @@ |
| 87 |
---- a/Makefile.in 2018-10-31 21:12:16.856861967 +0100 |
| 88 |
-+++ b/Makefile.in 2018-10-31 21:15:26.611628532 +0100 |
| 89 |
-@@ -326,7 +326,7 @@ |
| 90 |
- |
| 91 |
- pkgIndex.tcl-hand: |
| 92 |
- @(echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \ |
| 93 |
-- "load [list [file join $$dir $(PKG_LIB_FILE)]];\ |
| 94 |
-+ "load $(PKG_LIB_FILE);\ |
| 95 |
- source [list [file join $$dir tdom.tcl]]"'\ |
| 96 |
- ) > pkgIndex.tcl |
| 97 |
- |
| 98 |
-@@ -422,7 +422,7 @@ |
| 99 |
- #======================================================================== |
| 100 |
- |
| 101 |
- install-lib-binaries: binaries |
| 102 |
-- @$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir) |
| 103 |
-+ @$(INSTALL_DATA_DIR) $(DESTDIR)$(libdir) |
| 104 |
- @list='$(lib_BINARIES)'; for p in $$list; do \ |
| 105 |
- if test -f $$p; then \ |
| 106 |
- if test "x$$stub" = "xstub"; then \ |
| 107 |
-@@ -432,15 +432,15 @@ |
| 108 |
- echo " $(RANLIB) $$p"; \ |
| 109 |
- $(RANLIB) $$p; \ |
| 110 |
- fi; \ |
| 111 |
-- echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ |
| 112 |
-- $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \ |
| 113 |
-+ echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p"; \ |
| 114 |
-+ $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p; \ |
| 115 |
- stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ |
| 116 |
- ext=`echo $$p|sed -e "s/.*\.//"`; \ |
| 117 |
- if test "x$$ext" = "xdll"; then \ |
| 118 |
- lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ |
| 119 |
- if test -f $$lib; then \ |
| 120 |
-- echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \ |
| 121 |
-- $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \ |
| 122 |
-+ echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \ |
| 123 |
-+ $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \ |
| 124 |
- fi; \ |
| 125 |
- fi; \ |
| 126 |
- fi; \ |
| 127 |
-@@ -450,13 +450,13 @@ |
| 128 |
- @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \ |
| 129 |
- if test -f $(srcdir)/$$p; then \ |
| 130 |
- destp=`basename $$p`; \ |
| 131 |
-- echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \ |
| 132 |
-- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \ |
| 133 |
-+ echo " Install $$destp $(DESTDIR)$(libdir)/$$destp"; \ |
| 134 |
-+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(libdir)/$$destp; \ |
| 135 |
- fi; \ |
| 136 |
- done |
| 137 |
- @if test "x$(SHARED_BUILD)" = "x1"; then \ |
| 138 |
-- echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \ |
| 139 |
-- $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \ |
| 140 |
-+ echo " Install pkgIndex.tcl $(DESTDIR)$(libdir)"; \ |
| 141 |
-+ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(libdir); \ |
| 142 |
- fi |
| 143 |
- |
| 144 |
- #======================================================================== |
| 145 |
|
| 146 |
diff --git a/dev-tcltk/tdom/tdom-0.9.1.ebuild b/dev-tcltk/tdom/tdom-0.9.1.ebuild |
| 147 |
index 9f39b444266..f670708e8b2 100644 |
| 148 |
--- a/dev-tcltk/tdom/tdom-0.9.1.ebuild |
| 149 |
+++ b/dev-tcltk/tdom/tdom-0.9.1.ebuild |
| 150 |
@@ -21,12 +21,6 @@ DEPEND=" |
| 151 |
dev-libs/expat" |
| 152 |
RDEPEND="${DEPEND}" |
| 153 |
|
| 154 |
-PATCHES=( |
| 155 |
- "${FILESDIR}/"${P}.patch |
| 156 |
- "${FILESDIR}/"${P}-tnc.patch |
| 157 |
- "${FILESDIR}/"${PN}-0.8.3-soname.patch |
| 158 |
-) |
| 159 |
- |
| 160 |
src_prepare() { |
| 161 |
append-libs -lm |
| 162 |
sed \ |
Archives