From c86aec496298fb20f0770f5ce9a2a37935f7aa5b Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 8 Jun 2018 02:11:51 -0500
Subject: put user stuff in user, not system

---
 system/weechat/APKBUILD                 | 66 ---------------------------------
 system/weechat/fix-python-linking.patch | 11 ------
 system/weechat/libintl-fix.patch        | 12 ------
 3 files changed, 89 deletions(-)
 delete mode 100644 system/weechat/APKBUILD
 delete mode 100644 system/weechat/fix-python-linking.patch
 delete mode 100644 system/weechat/libintl-fix.patch

(limited to 'system/weechat')

diff --git a/system/weechat/APKBUILD b/system/weechat/APKBUILD
deleted file mode 100644
index 2fe4eb629..000000000
--- a/system/weechat/APKBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
-pkgname=weechat
-pkgver=1.9.1
-pkgrel=1
-pkgdesc="A fast, light, extensible ncurses-based chat client"
-url="http://www.weechat.org"
-arch="all"
-license="GPL-3.0+"
-options="!check"  # Requires itself until 2.0.
-depends_dev="cmake gettext-dev ncurses-dev gnutls-dev libgcrypt-dev curl-dev
-	aspell-dev guile-dev lua5.3-dev perl-dev python3-dev zlib-dev"
-makedepends="$depends_dev"
-checkdepends="cpputest"
-subpackages="$pkgname-dev $pkgname-aspell:_plugin $pkgname-lua:_plugin
-	$pkgname-perl:_plugin $pkgname-python:_plugin
-	$pkgname-guile:_plugin $pkgname-lang"
-source="http://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz
-	fix-python-linking.patch
-	libintl-fix.patch"
-builddir="$srcdir/$pkgname-$pkgver"
-
-# secfixes:
-#   1.7.1-r0:
-#   - CVE-2017-8073
-#   1.9.1-r0:
-#   - CVE-2017-14727
-
-prepare() {
-	cd "$builddir"
-	default_prepare
-}
-
-build() {
-	cd "$builddir"
-	mkdir -p build
-	cd build
-	cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MAN=ON -DENABLE_TESTS=ON -DENABLE_PYTHON3=ON
-	make
-}
-
-package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir/" install
-}
-
-_plugin() {
-	local _name=${subpkgname#*-}
-	local _dir=usr/lib/weechat/plugins
-	pkgdesc="WeeChat $_name plugin"
-	depends="weechat"
-	if [ "$_name" = python ]; then
-		depends="$depends python3"
-	fi
-
-	mkdir -p "$subpkgdir"/$_dir
-	mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir
-}
-
-check() {
-	cd "$builddir"/build
-	ctest -V
-}
-
-sha512sums="e52bb5239e24477ec38f2ad71cb2274e0ffc4226fc36ec00beeb7cf7e754a8c58d9bbc424cb0900e7c803ed47b0956e8f420eaa4cc9cf407ab6dd4769ec94326  weechat-1.9.1.tar.gz
-23b1e3fa9fcade74738d9013b533a0be01dbadabe8a7d82c97d338cdf3e4efe0943b9671f6ec47ac4838d3ad29ab4fd2ce0e6b3c74b4c7280abfd7b040407678  fix-python-linking.patch
-59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca  libintl-fix.patch"
diff --git a/system/weechat/fix-python-linking.patch b/system/weechat/fix-python-linking.patch
deleted file mode 100644
index c94be8026..000000000
--- a/system/weechat/fix-python-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- weechat-1.9/cmake/FindPython.cmake.old	2017-06-25 03:20:52.000000000 -0500
-+++ weechat-1.9/cmake/FindPython.cmake	2017-09-24 18:04:48.181662013 -0500
-@@ -67,7 +67,7 @@
-     )
-   if(ENABLE_PYTHON3)
-     find_library(PYTHON_LIBRARY
--      NAMES python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
-+      NAMES python3.6m python3.6 python3.5m python3.5 python3.4m python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
-       HINTS ${PYTHON_POSSIBLE_LIB_PATH}
-       )
-   else()
diff --git a/system/weechat/libintl-fix.patch b/system/weechat/libintl-fix.patch
deleted file mode 100644
index a67cb37b6..000000000
--- a/system/weechat/libintl-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-libc gettext is never sufficient on musl
-
---- weechat-1.9/CMakeLists.txt.old	2017-06-25 03:20:52.000000000 -0500
-+++ weechat-1.9/CMakeLists.txt	2017-09-13 02:30:43.577284569 -0500
-@@ -162,6 +162,7 @@
-   find_package(Gettext)
-   if(GETTEXT_FOUND)
-     add_definitions(-DENABLE_NLS)
-+    list(APPEND EXTRA_LIBS intl)
-   endif()
- endif()
- 
-- 
cgit v1.2.3-60-g2f50