commit: 6bf3dc8251e79a674c8fc399004d05611f4508b3 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> AuthorDate: Mon Nov 4 08:11:56 2019 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Mon Nov 4 08:11:56 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf3dc82
dev-tcltk/tdom: fix installation Closes: https://bugs.gentoo.org/699262 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch | 55 ----------------------------- dev-tcltk/tdom/files/tdom-0.9.1.patch | 58 ------------------------------- dev-tcltk/tdom/tdom-0.9.1.ebuild | 6 ---- 3 files changed, 119 deletions(-) diff --git a/dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch b/dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch deleted file mode 100644 index 36d844d74cb..00000000000 --- a/dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/extensions/tnc/Makefile.in 2018-10-31 21:18:18.701695694 +0100 -+++ b/extensions/tnc/Makefile.in 2018-10-31 21:19:25.621555122 +0100 -@@ -372,25 +372,25 @@ - #======================================================================== - - install-lib-binaries: binaries -- @$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir) -+ @$(INSTALL_DATA_DIR) $(DESTDIR)$(libdir) - @list='$(lib_BINARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ -- $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \ -+ echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p"; \ -+ $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p; \ - stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ - if test "x$$stub" = "xstub"; then \ -- echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ -- $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ -+ echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \ -+ $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \ - else \ -- echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ -- $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ -+ echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \ -+ $(RANLIB) $(DESTDIR)$(libdir)/$$p; \ - fi; \ - ext=`echo $$p|sed -e "s/.*\.//"`; \ - if test "x$$ext" = "xdll"; then \ - lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ - if test -f $$lib; then \ -- echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \ -- $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \ -+ echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \ -+ $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \ - fi; \ - fi; \ - fi; \ -@@ -398,13 +398,13 @@ - @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - destp=`basename $$p`; \ -- echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \ -+ echo " Install $$destp $(DESTDIR)$(libdir)/$$destp"; \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(libdir)/$$destp; \ - fi; \ - done - @if test "x$(SHARED_BUILD)" = "x1"; then \ -- echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \ -- $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \ -+ echo " Install pkgIndex.tcl $(DESTDIR)$(libdir)"; \ -+ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(libdir); \ - fi - - #======================================================================== diff --git a/dev-tcltk/tdom/files/tdom-0.9.1.patch b/dev-tcltk/tdom/files/tdom-0.9.1.patch deleted file mode 100644 index 00d3df2a306..00000000000 --- a/dev-tcltk/tdom/files/tdom-0.9.1.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- a/Makefile.in 2018-10-31 21:12:16.856861967 +0100 -+++ b/Makefile.in 2018-10-31 21:15:26.611628532 +0100 -@@ -326,7 +326,7 @@ - - pkgIndex.tcl-hand: - @(echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \ -- "load [list [file join $$dir $(PKG_LIB_FILE)]];\ -+ "load $(PKG_LIB_FILE);\ - source [list [file join $$dir tdom.tcl]]"'\ - ) > pkgIndex.tcl - -@@ -422,7 +422,7 @@ - #======================================================================== - - install-lib-binaries: binaries -- @$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir) -+ @$(INSTALL_DATA_DIR) $(DESTDIR)$(libdir) - @list='$(lib_BINARIES)'; for p in $$list; do \ - if test -f $$p; then \ - if test "x$$stub" = "xstub"; then \ -@@ -432,15 +432,15 @@ - echo " $(RANLIB) $$p"; \ - $(RANLIB) $$p; \ - fi; \ -- echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ -- $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \ -+ echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p"; \ -+ $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p; \ - stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ - ext=`echo $$p|sed -e "s/.*\.//"`; \ - if test "x$$ext" = "xdll"; then \ - lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ - if test -f $$lib; then \ -- echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \ -- $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \ -+ echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \ -+ $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \ - fi; \ - fi; \ - fi; \ -@@ -450,13 +450,13 @@ - @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - destp=`basename $$p`; \ -- echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \ -+ echo " Install $$destp $(DESTDIR)$(libdir)/$$destp"; \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(libdir)/$$destp; \ - fi; \ - done - @if test "x$(SHARED_BUILD)" = "x1"; then \ -- echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \ -- $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \ -+ echo " Install pkgIndex.tcl $(DESTDIR)$(libdir)"; \ -+ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(libdir); \ - fi - - #======================================================================== diff --git a/dev-tcltk/tdom/tdom-0.9.1.ebuild b/dev-tcltk/tdom/tdom-0.9.1.ebuild index 9f39b444266..f670708e8b2 100644 --- a/dev-tcltk/tdom/tdom-0.9.1.ebuild +++ b/dev-tcltk/tdom/tdom-0.9.1.ebuild @@ -21,12 +21,6 @@ DEPEND=" dev-libs/expat" RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}/"${P}.patch - "${FILESDIR}/"${P}-tnc.patch - "${FILESDIR}/"${PN}-0.8.3-soname.patch -) - src_prepare() { append-libs -lm sed \
