From 914efad2733b51f620b2615201ff020cc6bb44ef Mon Sep 17 00:00:00 2001
From: Patrick McLean <chutzpah@gentoo.org>
Date: Thu, 10 Mar 2022 11:40:56 -0800
Subject: app-text/lowdown: Fix library installation (bug #832797)

Bug: https://bugs.gentoo.org/832797
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
---
 .../lowdown/files/lowdown-0.11.1-linking.patch     | 12 ++++--
 app-text/lowdown/lowdown-0.11.1-r1.ebuild          | 45 ++++++++++++++++++++++
 app-text/lowdown/lowdown-0.11.1.ebuild             | 45 ----------------------
 3 files changed, 53 insertions(+), 49 deletions(-)
 create mode 100644 app-text/lowdown/lowdown-0.11.1-r1.ebuild
 delete mode 100644 app-text/lowdown/lowdown-0.11.1.ebuild

(limited to 'app-text/lowdown')

diff --git a/app-text/lowdown/files/lowdown-0.11.1-linking.patch b/app-text/lowdown/files/lowdown-0.11.1-linking.patch
index 89595d54fb02..2aa5cb1fe58e 100644
--- a/app-text/lowdown/files/lowdown-0.11.1-linking.patch
+++ b/app-text/lowdown/files/lowdown-0.11.1-linking.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 7705432..4208e47 100644
+index ccc163d..d148da6 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -173,8 +173,8 @@ installwww: www
@@ -9,11 +9,11 @@ index 7705432..4208e47 100644
 -lowdown: liblowdown.a main.o
 -	$(CC) -o $@ main.o liblowdown.a $(LDFLAGS) $(LDADD_MD5) -lm
 +lowdown: liblowdown.so main.o
-+	$(CC) -o $@ main.o $(LDADD_MD5) -lm -llowdown $(LDFLAGS)
++	$(CC) -o $@ main.o $(LDADD_MD5) -lm -L. -llowdown $(LDFLAGS)
  
  lowdown-diff: lowdown
  	ln -f lowdown lowdown-diff
-@@ -183,7 +183,7 @@ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
+@@ -183,10 +183,10 @@ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
  	$(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
  
  liblowdown.so: $(OBJS) $(COMPAT_OBJS)
@@ -21,7 +21,11 @@ index 7705432..4208e47 100644
 +	$(CC) -shared -o $@.$(LIBVER) $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -lm  -Wl,-soname,$@.$(LIBVER)
  	ln -sf $@.$(LIBVER) $@
  
- install: bins
+-install: bins
++install: bins install_libs
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man1
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man5
 @@ -218,7 +218,7 @@ install_shared: liblowdown.so install_lib_common
  install_static: liblowdown.a install_lib_common
  	$(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
diff --git a/app-text/lowdown/lowdown-0.11.1-r1.ebuild b/app-text/lowdown/lowdown-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..203b145ffc66
--- /dev/null
+++ b/app-text/lowdown/lowdown-0.11.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+MY_PV="VERSION_${PV//./_}"
+DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
+HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
+SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/libcrypt:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
+	"${FILESDIR}/lowdown-0.11.1-linking.patch"
+)
+
+src_configure() {
+	append-flags -fPIC
+	tc-export CC AR
+
+	./configure \
+		PREFIX="/usr" \
+		MANDIR="/usr/share/man" \
+		LDFLAGS="${LDFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LIBDIR="/usr/$(get_libdir)" \
+		|| die "./configure failed"
+}
+
+src_compile() {
+	emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
+}
+
+src_test() {
+	emake regress
+}
diff --git a/app-text/lowdown/lowdown-0.11.1.ebuild b/app-text/lowdown/lowdown-0.11.1.ebuild
deleted file mode 100644
index 203b145ffc66..000000000000
--- a/app-text/lowdown/lowdown-0.11.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs flag-o-matic
-
-MY_PV="VERSION_${PV//./_}"
-DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
-HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
-SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="virtual/libcrypt:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
-	"${FILESDIR}/lowdown-0.11.1-linking.patch"
-)
-
-src_configure() {
-	append-flags -fPIC
-	tc-export CC AR
-
-	./configure \
-		PREFIX="/usr" \
-		MANDIR="/usr/share/man" \
-		LDFLAGS="${LDFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LIBDIR="/usr/$(get_libdir)" \
-		|| die "./configure failed"
-}
-
-src_compile() {
-	emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
-}
-
-src_test() {
-	emake regress
-}
-- 
cgit v1.2.3-65-gdbad