From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-888136-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id E053A1382C5
for <garchives@archives.gentoo.org>; Wed, 22 Jun 2016 06:43:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5A596E0934;
Wed, 22 Jun 2016 06:43:33 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 8D3EDE0934
for <gentoo-commits@lists.gentoo.org>; Wed, 22 Jun 2016 06:43:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0E2983406F2
for <gentoo-commits@lists.gentoo.org>; Wed, 22 Jun 2016 06:43:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C786A241E
for <gentoo-commits@lists.gentoo.org>; Wed, 22 Jun 2016 06:43:28 +0000 (UTC)
From: "Patrice Clement" <monsieurp@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" <monsieurp@gentoo.org>
Message-ID: <1466576028.0869a72937fa388f705dff3ff864d7fb02655d91.monsieurp@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-admin/conky/files/conky-1.10.0-cmake.patch app-admin/conky/files/conky-1.10.0-includefiles.patch
X-VCS-Directories: app-admin/conky/files/
X-VCS-Committer: monsieurp
X-VCS-Committer-Name: Patrice Clement
X-VCS-Revision: 0869a72937fa388f705dff3ff864d7fb02655d91
X-VCS-Branch: master
Date: Wed, 22 Jun 2016 06:43:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 258838f9-57ec-458a-989a-df15b8e638df
X-Archives-Hash: af80fa876840f051b7c0659bbab9dcc1
commit: 0869a72937fa388f705dff3ff864d7fb02655d91
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Jun 16 19:28:36 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 06:13:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0869a729
app-admin/conky: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/1688
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
app-admin/conky/files/conky-1.10.0-cmake.patch | 11 --------
.../conky/files/conky-1.10.0-includefiles.patch | 29 ----------------------
2 files changed, 40 deletions(-)
diff --git a/app-admin/conky/files/conky-1.10.0-cmake.patch b/app-admin/conky/files/conky-1.10.0-cmake.patch
deleted file mode 100644
index 4f9d276..0000000
--- a/app-admin/conky/files/conky-1.10.0-cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/Docbook.cmake 2014-06-21 09:51:44.857916287 +0200
-+++ cmake/Docbook.cmake.new 2014-06-21 09:53:37.251924303 +0200
-@@ -72,7 +72,7 @@
- COMMAND ${APP_XSLTPROC} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml > ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html
-
- COMMAND ${APP_DB2X_XSLTPROC} -s man ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml -o ${FIL}.mxml
-- COMMAND ${APP_DB2X_MANXML} ${FIL}.mxml --output-dir ${CMAKE_CURRENT_SOURCE_DIR}
-+ COMMAND ${APP_DB2X_MANXML} ${FIL}.mxml --encoding=UTF8 --output-dir ${CMAKE_CURRENT_SOURCE_DIR}
- COMMAND ${APP_XSLTPROC} http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.xml > ${CMAKE_CURRENT_SOURCE_DIR}/${FIL}.html
- COMMAND ${APP_MAN} -P '${APP_LESS} -is' ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.1 > ${CMAKE_SOURCE_DIR}/README
- COMMAND ${APP_SED} -i "s/[[:cntrl:]]\\[[0-9]*m//g" ${CMAKE_SOURCE_DIR}/README
diff --git a/app-admin/conky/files/conky-1.10.0-includefiles.patch b/app-admin/conky/files/conky-1.10.0-includefiles.patch
deleted file mode 100644
index 9480720..0000000
--- a/app-admin/conky/files/conky-1.10.0-includefiles.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/cmake/ConkyPlatformChecks.cmake
-+++ b/cmake/ConkyPlatformChecks.cmake
-@@ -22,7 +22,7 @@
-
- include(FindPkgConfig)
- include(CheckFunctionExists)
--include(CheckIncludeFile)
-+include(CheckIncludeFiles)
- include(CheckSymbolExists)
-
- # Check for some headers
-@@ -119,7 +119,7 @@ if(BUILD_HTTP)
- endif(BUILD_HTTP)
-
- if(BUILD_NCURSES)
-- check_include_file(ncurses.h NCURSES_H)
-+ check_include_files(ncurses.h NCURSES_H)
- find_library(NCURSES_LIB NAMES ncurses)
- if(NOT NCURSES_H OR NOT NCURSES_LIB)
- message(FATAL_ERROR "Unable to find ncurses library")
-@@ -167,7 +167,7 @@ endif(BUILD_PORT_MONITORS)
-
- # Check for iconv
- if(BUILD_ICONV)
-- check_include_file(iconv.h HAVE_ICONV_H)
-+ check_include_files(iconv.h HAVE_ICONV_H)
- find_library(ICONV_LIBRARY NAMES iconv)
- if(NOT ICONV_LIBRARY)
- # maybe iconv() is provided by libc