Merge branch 'feature/feedreader-webkit4' into 'master'

added useflag for choosing between webkit-gtk:3 and webkit-gtk:4



See merge request !20
This commit is contained in:
Manuel Friedli 2015-11-13 01:08:45 +01:00
commit 5f3079756a
3 changed files with 9 additions and 5 deletions

View file

@ -1,3 +1,3 @@
DIST FeedReader-1.2.1.tar.gz 970118 SHA256 cb24d6dcef46080f2aa61fdc1b0187a8c52aedf913e6f63325ee46c631e5c87a SHA512 386c4c137bb4abba918e4f987666358ebe3926b0d4d3b466648d2679efd218376baf1ff58c987dfff953e9b6f084a47db34df8044a3a64ecb1f8e560f0f09e74 WHIRLPOOL 3e6f62c18ffb1dbe669f969b76de496463a49804c3da5d9e35e8726e4cef45552291c94b33cf3129805720cacc51953d60dfb4b54658344c261b412f29ab847f DIST FeedReader-1.2.1.tar.gz 970118 SHA256 cb24d6dcef46080f2aa61fdc1b0187a8c52aedf913e6f63325ee46c631e5c87a SHA512 386c4c137bb4abba918e4f987666358ebe3926b0d4d3b466648d2679efd218376baf1ff58c987dfff953e9b6f084a47db34df8044a3a64ecb1f8e560f0f09e74 WHIRLPOOL 3e6f62c18ffb1dbe669f969b76de496463a49804c3da5d9e35e8726e4cef45552291c94b33cf3129805720cacc51953d60dfb4b54658344c261b412f29ab847f
EBUILD feedreader-1.2.1.ebuild 1400 SHA256 db428d2a78cb6ba6122e60b5129bb4e78b0fabefd20eb769f9a8c8e010e61750 SHA512 c41c7b248af87202a8d2dd7df39a9ff4b841648a81e5d420065d5d53f5a4635f560115b18f3250560b9b2cf02ab2d26e45f22d4579915caa6355b9bded25c33d WHIRLPOOL 9b089969a657072bca29522910f0d092f4bec08c64eb8c95b19513ce936f03a95ce48403bbc962bbdc1f00c0f1acd44081c6963b6fd30097207815a00a7b26c6 EBUILD feedreader-1.2.1.ebuild 1454 SHA256 023d0c3fa1490302e975b8f8e7c2a674cba4b21a9c3ca071ef2894758fe7a53e SHA512 411e0da9ac84b2cce0486e5f161485381952c0ab32490ce5f890244b909a7ad4692b227896844fe7b7ccbc4a6cdf07f4be45ff811a946908dde00c5120f9c831 WHIRLPOOL e478933dccf5faa5eb54e8081a31dce490acd5707a158d180f907e8f7a3f607533fd077fe5d49890f7c34c803c1415bf6241a230dd572e230e0ffb580a571a02
MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 MISC metadata.xml 338 SHA256 065c970f65dc2d874999563e23f1cd3b3eb7d81b3858c7c9fed5ede9c9230d03 SHA512 9f668348e070853e0b24d1bf8f18dcc33d80f40f8d70fe7363b6d008f3a1e841b14a3cadf94e40643b39b4fec18bb06df5ae0a3412b96cc5c43a8c5fe7aa1f19 WHIRLPOOL 51094d7ce385f827f140171e796cfa35a0acc4e69d6c5eea5e305af79be3c255d5d8d1b08fdb219a54e9771b6d8311a03845c1ef1ca4076cd93617d16cb35ed6

View file

@ -19,7 +19,7 @@ LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~amd64" KEYWORDS="~amd64"
IUSE="+gnome" IUSE="+gnome webkit4"
RDEPEND=">=x11-libs/gtk+-3.12:3 RDEPEND=">=x11-libs/gtk+-3.12:3
app-text/html2text app-text/html2text
@ -32,7 +32,8 @@ RDEPEND=">=x11-libs/gtk+-3.12:3
x11-libs/libnotify x11-libs/libnotify
dev-libs/libxml2 dev-libs/libxml2
net-libs/rest:0.7 net-libs/rest:0.7
net-libs/webkit-gtk:3 !webkit4? ( net-libs/webkit-gtk:3 )
webkit4? ( net-libs/webkit-gtk:4 )
dev-libs/gobject-introspection dev-libs/gobject-introspection
gnome? ( gnome-base/gnome-keyring )" gnome? ( gnome-base/gnome-keyring )"
@ -53,7 +54,7 @@ src_configure() {
-DCMAKE_INSTALL_PREFIX="${PREFIX}" -DCMAKE_INSTALL_PREFIX="${PREFIX}"
-DGSETTINGS_LOCALINSTALL=OFF -DGSETTINGS_LOCALINSTALL=OFF
) )
# $(cmake-utils_use_use myUseFlag WEBKIT_4) $(cmake-utils_use_use webkit4 WEBKIT_4)
cmake-utils_src_configure cmake-utils_src_configure
} }

View file

@ -5,4 +5,7 @@
<email>manuel@fritteli.ch</email> <email>manuel@fritteli.ch</email>
<name>Manuel Friedli</name> <name>Manuel Friedli</name>
</maintainer> </maintainer>
<use>
<flag name="webkit4">Use net-libs/webkit-gtk:4 instead of net-libs/webkit-gtk:3</flag>
</use>
</pkgmetadata> </pkgmetadata>