calculate
/
gentoo-overlay
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync with portage [Mon Apr 10 15:01:29 MSK 2017].

Browse Source
mhiretskiy 846
root 7 years ago
parent e6e267ef7d
commit d3759e626d
18 changed files with 129 additions and 220 deletions
Show Stats Download Patch File Download Diff File

1
app-i18n/uchardet/Manifest
Unescape View File

@ -1,2 +1 @@
DIST uchardet-0.0.5.tar.gz 222864 SHA256 7c5569c8ee1a129959347f5340655897e6a8f81ec3344de0012a243f868eabd1 SHA512 e32ff3e7baa9804199e3ca240ce590fed3fcb539fe4d780c4ec205fa5cbd45415e2c8c8db51d97965f9f9bbaad1f34613d5ed2849aafd9bbc3dda850c0be20ac WHIRLPOOL 737becbbf1be09e049207311c964ee61e78bce3c3cdc31cd5a071a52aef22b5f0d803a243aac8b0f9840c19d27ffbac3e08454ec7a74c2bb85f19f15333e3af6
DIST uchardet-0.0.6.tar.xz 169192 SHA256 8351328cdfbcb2432e63938721dd781eb8c11ebc56e3a89d0f84576b96002c61 SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 WHIRLPOOL 3fa915fa768be9cb4002e0a1b84c120db017f59fd0011df36a4853c53b403d5f3839647ab7aff8d8691a43ef0ecc90714475ef6a46a85d20abbd57fba7d90a13

116
app-i18n/uchardet/files/uchardet-0.0.5-fix-ASCII-detection.patch
Unescape View File

@ -1,116 +0,0 @@
commit 4c8316f9cfda38d75fb015c0eb40e0eebb03d28f
Author: Jehan <jehan@girinstud.io>
Date: Sat Dec 5 21:04:20 2015 +0100
Nearly-ASCII text with NBSP is still not ASCII.
There is no "exception" in encoding. The non-breaking space 0xA0 is not
ASCII, and therefore returning "ASCII" will later create issues (for
instance trying to re-encode with iconv produces an error).
This was obviously an explicit decision in original code (according to
code comments), probably tied to specifity of the original program from
Mozilla. Now we want strict detection.
I will return "ISO-8859-1" for "nearly-ASCII texts with NBSP as only
exception" (note that I could have returned any ISO-8859 charsets since
they all have this character in common).
diff --git a/src/nsUniversalDetector.cpp b/src/nsUniversalDetector.cpp
index ab8bae0..ff06b9d 100644
--- a/src/nsUniversalDetector.cpp
+++ b/src/nsUniversalDetector.cpp
@@ -47,6 +47,7 @@
nsUniversalDetector::nsUniversalDetector(PRUint32 aLanguageFilter)
{
+ mNbspFound = PR_FALSE;
mDone = PR_FALSE;
mBestGuess = -1; //illegal value as signal
mInTag = PR_FALSE;
@@ -75,6 +76,7 @@ nsUniversalDetector::~nsUniversalDetector()
void
nsUniversalDetector::Reset()
{
+ mNbspFound = PR_FALSE;
mDone = PR_FALSE;
mBestGuess = -1; //illegal value as signal
mInTag = PR_FALSE;
@@ -162,9 +164,10 @@ nsresult nsUniversalDetector::HandleData(const char* aBuf, PRUint32 aLen)
PRUint32 i;
for (i = 0; i < aLen; i++)
{
- /* Other than 0xA0, if every other character is ASCII, the page is ASCII.
+ /* If every other character is ASCII or 0xA0, we don't run charset
+ * probers.
* 0xA0 (NBSP in a few charset) is apparently a rare exception
- * of non-ASCII character contained in ASCII text. */
+ * of non-ASCII character often contained in nearly-ASCII text. */
if (aBuf[i] & '\x80' && aBuf[i] != '\xA0')
{
/* We got a non-ASCII byte (high-byte) */
@@ -203,11 +206,19 @@ nsresult nsUniversalDetector::HandleData(const char* aBuf, PRUint32 aLen)
}
else
{
- //ok, just pure ascii so far
- if ( ePureAscii == mInputState &&
- (aBuf[i] == '\033' || (aBuf[i] == '{' && mLastChar == '~')) )
+ /* Just pure ASCII or NBSP so far. */
+ if (aBuf[i] == '\xA0')
{
- //found escape character or HZ "~{"
+ /* ASCII with the only exception of NBSP seems quite common.
+ * I doubt it is really necessary to train a model here, so let's
+ * just make an exception.
+ */
+ mNbspFound = PR_TRUE;
+ }
+ else if (mInputState == ePureAscii &&
+ (aBuf[i] == '\033' || (aBuf[i] == '{' && mLastChar == '~')))
+ {
+ /* We found an escape character or HZ "~{". */
mInputState = eEscAscii;
}
mLastChar = aBuf[i];
@@ -229,6 +240,10 @@ nsresult nsUniversalDetector::HandleData(const char* aBuf, PRUint32 aLen)
mDone = PR_TRUE;
mDetectedCharset = mEscCharSetProber->GetCharSetName();
}
+ else if (mNbspFound)
+ {
+ mDetectedCharset = "ISO-8859-1";
+ }
else
{
/* ASCII with the ESC character (or the sequence "~{") is still
@@ -253,8 +268,17 @@ nsresult nsUniversalDetector::HandleData(const char* aBuf, PRUint32 aLen)
break;
default:
- /* Pure ASCII */
- mDetectedCharset = "ASCII";
+ if (mNbspFound)
+ {
+ /* ISO-8859-1 is a good result candidate for ASCII + NBSP.
+ * (though it could have been any ISO-8859 encoding). */
+ mDetectedCharset = "ISO-8859-1";
+ }
+ else
+ {
+ /* Pure ASCII */
+ mDetectedCharset = "ASCII";
+ }
break;
}
return NS_OK;
diff --git a/src/nsUniversalDetector.h b/src/nsUniversalDetector.h
index 4d9b460..9f0a4b1 100644
--- a/src/nsUniversalDetector.h
+++ b/src/nsUniversalDetector.h
@@ -72,6 +72,7 @@ protected:
virtual void Report(const char* aCharset) = 0;
virtual void Reset();
nsInputState mInputState;
+ PRBool mNbspFound;
PRBool mDone;
PRBool mInTag;
PRBool mStart;

19
app-i18n/uchardet/files/uchardet-0.0.5-fix-return-code-on-error.patch
Unescape View File

@ -1,19 +0,0 @@
commit 248d6dbd351c22989090d318128cb38b11a89f98
Author: Jehan <jehan@girinstud.io>
Date: Thu Jan 21 18:16:42 2016 +0100
tools: exit with non-zero value on uchardet error.
diff --git a/src/tools/uchardet.cpp b/src/tools/uchardet.cpp
index 91912a0..bcfa234 100644
--- a/src/tools/uchardet.cpp
+++ b/src/tools/uchardet.cpp
@@ -60,7 +60,7 @@ void detect(FILE * fp)
if (retval != 0)
{
fprintf(stderr, "Handle data error.\n");
- exit(0);
+ exit(1);
}
}
uchardet_data_end(handle);

30
app-i18n/uchardet/files/uchardet-0.0.5-use-proper-package-name.patch
Unescape View File

@ -1,30 +0,0 @@
commit b6d872bbec3be7abfccbdfd3d90e784cf7281c55
Author: Jehan <jehan@girinstud.io>
Date: Tue Dec 15 21:40:16 2015 +0100
app: package name wrong in CMakeLists.txt.
Probably coming from a copy-paste error when the build system was
originally created.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b65c49..4f279e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
######## Project settings
cmake_minimum_required(VERSION 2.8)
-set (PACKAGE_NAME opencc)
+set (PACKAGE_NAME uchardet)
project (${PACKAGE_NAME} CXX C)
enable_testing()
@@ -54,7 +54,7 @@ if (DEFINED SYSCONF_INSTALL_DIR)
set (DIR_ETC ${SYSCONF_INSTALL_DIR})
endif (DEFINED SYSCONF_INSTALL_DIR)
-set (DIR_SHARE_UCHARDET ${DIR_SHARE}/opencc)
+set (DIR_SHARE_UCHARDET ${DIR_SHARE}/uchardet)
set (DIR_SHARE_LOCALE ${DIR_SHARE}/locale)
######## Configuration

33
app-i18n/uchardet/uchardet-0.0.5-r1.ebuild
Unescape View File

@ -1,33 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit cmake-utils
DESCRIPTION="An encoding detector library"
HOMEPAGE="https://github.com/BYVoid/uchardet https://www.freedesktop.org/wiki/Software/uchardet/"
SRC_URI="https://github.com/BYVoid/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
SLOT="0"
KEYWORDS="alpha amd64 ~arm hppa ppc64 x86"
IUSE="static-libs test"
PATCHES=(
"${FILESDIR}/${P}-fix-ASCII-detection.patch"
"${FILESDIR}/${P}-use-proper-package-name.patch"
"${FILESDIR}/${P}-fix-return-code-on-error.patch"
)
src_prepare() {
use test || cmake_comment_add_subdirectory test
cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_build static-libs STATIC)
)
cmake-utils_src_configure
}

2
metadata/dtd/timestamp.chk
Unescape View File

@ -1 +1 @@
Mon, 10 Apr 2017 09:09:36 +0000
Mon, 10 Apr 2017 11:09:36 +0000

2
metadata/glsa/timestamp.chk
Unescape View File

@ -1 +1 @@
Mon, 10 Apr 2017 09:09:36 +0000
Mon, 10 Apr 2017 11:09:36 +0000

12
metadata/md5-cache/app-i18n/uchardet-0.0.5-r1
Unescape View File

@ -1,12 +0,0 @@
DEFINED_PHASES=compile configure install prepare test
DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
DESCRIPTION=An encoding detector library
EAPI=5
HOMEPAGE=https://github.com/BYVoid/uchardet https://www.freedesktop.org/wiki/Software/uchardet/
IUSE=static-libs test
KEYWORDS=alpha amd64 ~arm hppa ppc64 x86
LICENSE=|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )
SLOT=0
SRC_URI=https://github.com/BYVoid/uchardet/archive/v0.0.5.tar.gz -> uchardet-0.0.5.tar.gz
_eclasses_=cmake-utils a69f3a404abc4ade0a99e523f51b989d epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 multiprocessing 284a473719153462f3e974d86c8cb81c toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=35045037e362c355482ff354e4dca7f5

13
metadata/md5-cache/net-misc/nextcloud-client-2.3.1
Unescape View File

@ -0,0 +1,13 @@
DEFINED_PHASES=compile configure install postinst prepare test unpack
DEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 sys-fs/inotify-tools virtual/libiconv dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) dev-qt/linguist-tools:5 doc? ( dev-python/sphinx dev-texlive/texlive-latexextra virtual/latex-base ) dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( dev-util/cmocka dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2
DESCRIPTION=Nextcloud themed desktop client
EAPI=6
HOMEPAGE=https://github.com/nextcloud/client_theming
IUSE=doc dolphin nautilus samba +sftp test
KEYWORDS=~amd64 ~x86
LICENSE=CC-BY-3.0 GPL-2
RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 sys-fs/inotify-tools virtual/libiconv dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) !net-misc/ocsync !net-misc/owncloud-client
SLOT=0
SRC_URI=http://download.owncloud.com/desktop/stable/owncloudclient-2.3.1.tar.xz https://github.com/nextcloud/client_theming/archive/v2.3.1.tar.gz -> nextcloud-client-2.3.1.tar.gz
_eclasses_=cmake-utils a69f3a404abc4ade0a99e523f51b989d epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 multiprocessing 284a473719153462f3e974d86c8cb81c toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee versionator c80ccf29e90adea7c5cae94b42eb76d0
_md5_=cb31f970f37daf6713452e8030f0dc98

4
metadata/md5-cache/sys-devel/bc-1.07.1
Unescape View File

@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure
DEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= ) sys-devel/flex
DEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= ) sys-apps/ed sys-devel/flex
DESCRIPTION=Handy console-based calculator utility
EAPI=5
HOMEPAGE=https://www.gnu.org/software/bc/bc.html
@ -10,4 +10,4 @@ RDEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/re
SLOT=0
SRC_URI=mirror://gnu-alpha/bc/bc-1.07.1.tar.gz mirror://gnu/bc/bc-1.07.1.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 epunt-cxx f8073339d152f56626493f43d8ba4691 estack 5ac2a138d0b33354b764d84f9e835db8 eutils e7491451996e8b54c3caeb713285b0fb flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 0236be304ee52e7f179ed2f337075515 toolchain-funcs 6eb35f81556258a4bc9182ad3dfd58ee
_md5_=248d2536c38769c2f6e12dc5aca808ed
_md5_=cb6e47395778f7134d776fc7a067831f

2
metadata/news/timestamp.chk
Unescape View File

@ -1 +1 @@
Mon, 10 Apr 2017 09:09:36 +0000
Mon, 10 Apr 2017 11:09:36 +0000

2
metadata/timestamp
Unescape View File

@ -1 +1 @@
Mon Apr 10 09:09:36 UTC 2017
Mon Apr 10 11:09:36 UTC 2017

2
metadata/timestamp.chk
Unescape View File

@ -1 +1 @@
Mon, 10 Apr 2017 09:30:01 +0000
Mon, 10 Apr 2017 11:30:01 +0000

2
metadata/timestamp.x
Unescape View File

@ -1 +1 @@
1491815101 Mon 10 Apr 2017 09:05:01 AM UTC
1491822301 Mon 10 Apr 2017 11:05:01 AM UTC

2
metadata/xml-schema/timestamp.chk
Unescape View File

@ -1 +1 @@
Mon, 10 Apr 2017 09:09:36 +0000
Mon, 10 Apr 2017 11:09:36 +0000

2
net-misc/nextcloud-client/Manifest
Unescape View File

@ -1,2 +1,4 @@
DIST nextcloud-client-2.2.4.tar.gz 642472 SHA256 55a16505c8551cb8e6af5d2f570b6d4384f33a75a79810864e1d4555d53dedf9 SHA512 646e624335cc11ac862b1b58ceb36aa8264f2db6ed586ae473b7522a5fdab7e30f196c1680f8dcf70af3b204374488e3bd589bb41669f9abcd9509d2293afc3f WHIRLPOOL 1bf627732492726fbb8394c2c88dcef667b8079a8923c906a58bd2039b14b27e76224ceb8d08654806d7f55f966b949c338ec759746acb90e023adc608d659da
DIST nextcloud-client-2.3.1.tar.gz 654810 SHA256 5fc6f9f981d68110982ab006cdf9d68caa0c59015e57f4491b9a705fb6c83dd6 SHA512 f8210c8cc08e0bfb80e63b18af305c2a8e2309f673caca5bc748c130d960d444ab2db3fad3e43dbfffbe072748c85e15a50d0ebe1fd491dec7553ac8d9552cfe WHIRLPOOL 5a38a708647758ddb54d7d47dd30a71e59b03c3c45e6cfd9ac218c013da9dfc56d07b247982056f58e083d82c138576679525d994665717c739cc9f5cdd0238b
DIST owncloudclient-2.2.4.tar.xz 12216896 SHA256 f313534f7cdae686beeaa6670d9e3586a627ce78b67cab6e42a448a675d9e7d3 SHA512 5bc5273c90ab63c411e58d1fe13636f6b5977c28470efe53296a71541aaa63af99001cb630adaee99b9b81a8b56fe0f66c337319464ab950dd6eac4cdd53f951 WHIRLPOOL 18aa5076049f9cdfbafa58454937b7fc4c38a5405b6e1375d762d88bbfae92b813cd2ec88a4e4108012137c94908894821575d3f6d2bf694e35d734f2b8fbd37
DIST owncloudclient-2.3.1.tar.xz 12260696 SHA256 93143752234a0bc4c9798b69d8239996d92130eecdc1d93b75e3d49b899f3914 SHA512 2dec3d4b452faca32e15c1a461d3fec97fc1c2e85bbfe2cb02035371a5426b8458be1382ed6b4a1102a4f38241580c3d49980ea388344365297a4a84f8dc9add WHIRLPOOL 49abeb9b9843a024338cd2d7c3a87625f7cd4f832db03513dc4d7b0d5d1908a5691d6f1e7b7437175084c30a5e3e18d837785afa5647971fdcb8e963db2d54b5

104
net-misc/nextcloud-client/nextcloud-client-2.3.1.ebuild
Unescape View File

@ -0,0 +1,104 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit cmake-utils
DESCRIPTION="Nextcloud themed desktop client"
HOMEPAGE="https://github.com/nextcloud/client_theming"
SRC_URI="http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz
https://github.com/nextcloud/client_theming/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="CC-BY-3.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc dolphin nautilus samba +sftp test"
COMMON_DEPEND=">=dev-db/sqlite-3.4:3
dev-libs/qtkeychain[qt5]
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtsql:5
dev-qt/qtwebkit:5
sys-fs/inotify-tools
virtual/libiconv
dolphin? (
kde-frameworks/kcoreaddons:5
kde-frameworks/kio:5
)
nautilus? ( dev-python/nautilus-python )
samba? ( >=net-fs/samba-3.5 )
sftp? ( >=net-libs/libssh-0.5 )
"
RDEPEND="${COMMON_DEPEND}
!net-misc/ocsync
!net-misc/owncloud-client
"
DEPEND="${COMMON_DEPEND}
dev-qt/linguist-tools:5
doc? (
dev-python/sphinx
dev-texlive/texlive-latexextra
virtual/latex-base
)
dolphin? ( kde-frameworks/extra-cmake-modules )
test? (
dev-util/cmocka
dev-qt/qttest:5
)
"
S=${WORKDIR}/client_theming-${PV}
src_unpack() {
default
rmdir "${S}"/client || die
mv "${WORKDIR}"/owncloudclient-${PV} "${S}"/client \
|| die
}
src_prepare() {
CMAKE_USE_DIR="${S}"/client
# Keep tests in ${T}
sed -i -e "s#\"/tmp#\"${T}#g" client/test/test*.cpp || die
# Fix icon name
sed -e "/^Icon.*=/s/@APPLICATION_EXECUTABLE@/Nextcloud/" \
-i client/mirall.desktop.in || die
if ! use nautilus; then
pushd client/shell_integration > /dev/null || die
cmake_comment_add_subdirectory nautilus
popd > /dev/null || die
fi
default
}
src_configure() {
local mycmakeargs=(
-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-DWITH_ICONV=ON
-DWITH_DOC=$(usex doc)
-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-DBUILD_WITH_QT4=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
-DUNIT_TESTING=$(usex test)
-DOEM_THEME_DIR="${S}"/nextcloudtheme
)
cmake-utils_src_configure
}
pkg_postinst() {
if ! use doc ; then
elog "Documentation and man pages not installed"
elog "Enable doc USE-flag to generate them"
fi
}

1
sys-devel/bc/bc-1.07.1.ebuild
Unescape View File

@ -21,6 +21,7 @@ RDEPEND="!readline? ( libedit? ( dev-libs/libedit:= ) )
>=sys-libs/ncurses-5.2:=
)"
DEPEND="${RDEPEND}
sys-apps/ed
sys-devel/flex"
src_configure() {

Write Preview
Loading…
Cancel
Save