diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..6645601 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,3 @@ +Repoman: + script: + - repoman -x -p diff --git a/dev-java/nexus-oss-bin/Manifest b/dev-java/nexus-oss-bin/Manifest index 4876a46..5c58898 100644 --- a/dev-java/nexus-oss-bin/Manifest +++ b/dev-java/nexus-oss-bin/Manifest @@ -1,4 +1,5 @@ AUX init.sh 381 SHA256 7adb00b5de411223dcdaf017005e7103d8716e885a008f19aa8d56db2afa47de SHA512 b458fda89207b327f34c3e14f0c51ab86e7aa271867ec9a6c72634e1b8d81aebafba8ac6279f359fc9ba520920bee64fb439588b3f771d647ee8f3fde0ea742d WHIRLPOOL ac4d4fc6facc926f697706beb7b95d9c3bceb35a2e2d04eb656a73b2ed397c4dac521b3566307189655d6afcaa1ea116fbb8ff645a32cad484bf3ed0380b2dc8 AUX nexus-wrapper-2.11.2.patch 1193 SHA256 f77229f2dddaae7205eec13188487ff73a663bbcd5d45b01201706044c1f18e0 SHA512 6f7230eeebe94e2cee426ffb3f1939c0a5e3b637002de7aef36608c4e95e399db1c9e28883f6e6a67cdff08804baa69efaae310871c3a9442508c72af556da6f WHIRLPOOL 2c3b48a30f4202177deb75d437a3aedc4ecf86870d4ab8e2ea79b5cb909a34630677f1fa006328554ea08807a88c1959fbf7e86ea49981dd1847687183d4ed70 DIST nexus-2.11.2-06-bundle.tar.gz 70793247 SHA256 e3fe7811d932ef449fafc4287a27fae62127154297d073f594ca5cba4721f59e SHA512 31b33afad7f31d33af78f9430c04c20ea6a9f4c7391c014493ecd0d02837f9eef99443012682ac0f463ae113b11fb2736078a36f25c1e69f510abc2c5c3a7f7d WHIRLPOOL c4ad2eb6bf1c78ae60de923e741e99bc85c61a68799f8329194648cc6669d0c6a411d0440620069637b480f7cd79ebbbba507a9ef846c678e218c81a084a37f1 -EBUILD nexus-oss-bin-2.11.2.ebuild 1089 SHA256 0d5aeb1e44ed49c269f0113aa7b7b66cabd3999ecbeacceef1c47d116aefcc9d SHA512 99ce64c548fdf6361a4faeb42927841354ffe9e77a8be77aea2a231db35a4c4509456b8c22f03efc7c0aac39c9bb8ced22b68a2398426ea4c28bc9403abf4265 WHIRLPOOL 18e5712133f11c4ea00e0a1ed1597e2e0117f683277d90740a2f423eebeab993c897c69c62e41bdee0cb51dfc792926bedc295c844757ae1abe01005655e7b58 +EBUILD nexus-oss-bin-2.11.2.ebuild 1077 SHA256 a6764695b07366aaebb582698277df84897a958a5476222549da496e3997287b SHA512 5a312b18e201bd46cb26dd7de974b01c58d11cc15665d4c9e5192f915dbf41fcf7ebad5985198d9061825d1ea929c701586260493f708eeb996c2f255387dbdb WHIRLPOOL abd2162cd46c2e0ca09cdb048a5297eaa1600cdf77945405154e00fa517c26a70c89c7e67225c89b5c77bade9ed6ce5974fec9e2cff1eae3e1e058ee3cb9898c +MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/dev-java/nexus-oss-bin/metadata.xml b/dev-java/nexus-oss-bin/metadata.xml new file mode 100644 index 0000000..1315b88 --- /dev/null +++ b/dev-java/nexus-oss-bin/metadata.xml @@ -0,0 +1,8 @@ + + + + + manuel@fritteli.ch + Manuel Friedli + + diff --git a/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.2.ebuild b/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.2.ebuild index 2cd982a..1d0792a 100644 --- a/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.2.ebuild +++ b/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.2.ebuild @@ -1,3 +1,7 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + EAPI="5" inherit eutils user @@ -21,29 +25,27 @@ INSTALL_DIR="/opt/nexus" WEBAPP_DIR="${INSTALL_DIR}/nexus-oss-webapp" pkg_setup() { - #enewgroup [gid] - enewgroup nexus - #enewuser [uid] [shell] [homedir] [groups] [params] - enewuser nexus -1 /bin/bash /opt/nexus "nexus" + enewgroup nexus + enewuser nexus -1 /bin/bash /opt/nexus "nexus" } src_unpack() { - unpack ${A} - cd "${S}" + unpack ${A} + cd "${S}" } src_prepare() { - epatch "${FILESDIR}/nexus-wrapper-${PV}.patch" + epatch "${FILESDIR}/nexus-wrapper-${PV}.patch" } src_install() { - insinto ${WEBAPP_DIR} - doins -r nexus-${PV}${SUB_VERSION}/* + insinto ${WEBAPP_DIR} + doins -r nexus-${PV}${SUB_VERSION}/* - newinitd "${FILESDIR}/init.sh" nexus + newinitd "${FILESDIR}/init.sh" nexus - fowners -R nexus:nexus ${INSTALL_DIR} - fperms 755 "${INSTALL_DIR}/nexus-oss-webapp/bin/jsw/linux-x86-64/wrapper" - fperms 755 "${INSTALL_DIR}/nexus-oss-webapp/bin/jsw/linux-x86-32/wrapper" - fperms 755 "${INSTALL_DIR}/nexus-oss-webapp/bin/nexus" + fowners -R nexus:nexus ${INSTALL_DIR} + fperms 755 "${INSTALL_DIR}/nexus-oss-webapp/bin/jsw/linux-x86-64/wrapper" + fperms 755 "${INSTALL_DIR}/nexus-oss-webapp/bin/jsw/linux-x86-32/wrapper" + fperms 755 "${INSTALL_DIR}/nexus-oss-webapp/bin/nexus" } diff --git a/dev-vcs/gitlab-ci-multi-runner/Manifest b/dev-vcs/gitlab-ci-multi-runner/Manifest index 8c5a5ed..03c9073 100644 --- a/dev-vcs/gitlab-ci-multi-runner/Manifest +++ b/dev-vcs/gitlab-ci-multi-runner/Manifest @@ -3,4 +3,5 @@ AUX gitlab-ci-multi-runner.init 696 SHA256 03fc8cf6f5d8883b69122362202779f1ef8c8 DIST gitlab-ci-multi-runner-0.5.5-amd64 11633640 SHA256 00982b6f9cfea548a3e41fad9f50f2c8b221251ea2e7e8ac64563f62663537a3 SHA512 89a9474b5dc0dfd5bf53e4c60f40c43f8db1288e49960dc58d5283a61c22474c682041b3b04a4b4533536deef63cc06a65f0b5440891c5f7951d45508236563a WHIRLPOOL 1375f34887bc09d29ff2009a8344e6ec7c2a7d16f31ca1d063cce30607c003df99f80dd4d01244e991745d0ccdccce76077e6597e5ccb38a89a6cce59324b2b9 DIST gitlab-ci-multi-runner-0.5.5-arm 9292840 SHA256 0c1641fe1bff208e9166ad1ea3898652989017711e51b38838c48365de2870f5 SHA512 1d9a6c7200614acfa5c3461187ab9df0fe46bead5284d586ea24e2c7c243422ae096dd6faf40ca2b05d3fe567d589a33a87212449fcc7ff56ec1e759955d44c9 WHIRLPOOL 8ea40c13de87cffd1c77dedba64315133106bdfe0cfb8d87da8932d6abde0e88d6577fb9c8ada090b98a0f65d82e105b57a2236fe24385ed72c62a760f36256a DIST gitlab-ci-multi-runner-0.5.5-x86 9377072 SHA256 d9cfc1fb809a4954b18b9d15cae078c552715ab8d596c5e07db2104131c286fb SHA512 952f60dca6cc5a46bc2906ad38e3f02b97181c48480fd0ea91c00e96a266cf37d105da4af1934b294c72a507cfd8e114c2907df80e4269cb082bc0775e451258 WHIRLPOOL 1d512571520a2901e00f758cdfb33441f885a801c717b06b72b626731b9c7e4637b6796fd21944032a1ab5215228e5f288577c4498a52256321446e8ef7fb8aa -EBUILD gitlab-ci-multi-runner-0.5.5-r1.ebuild 2318 SHA256 7176917ec5a10bf8e2359d24e407416d1b9fdf81346105ac3a7cea3a6007fd35 SHA512 4e188a45f7d65b87b0731afc577bdfa743c88a581a39b2cf47beba183bc34ca8267fed4c8d692bed1df8727b561f4319f7cbe0b8fba3b3378090fc116d71ccb1 WHIRLPOOL bc3146adf2d19fe156fbcebff4b2f277bd589d7ec9885e93c4b36977d7195b975a0e505df3284bb38cf044df919193c990830f8cc4f4eafc53a36a38d3b904d4 +EBUILD gitlab-ci-multi-runner-0.5.5-r1.ebuild 2238 SHA256 e5c5c8172052cce018a8bfe17224a379175fade6bae83a06b8649d987ac6d496 SHA512 dafddb480bf34aa1d17eb57a82b7380c376f303a84bd5a1162030541775935e6352c7d51675465203f898e6caea1ef2802dcbcbbc200d8f4d777082c074380df WHIRLPOOL ea427e8a9259348c5b604cf3cd18993b843bc8312326be745d48ea0b77480101124cd0babfcc21e172cb095bc1dae53010fd2c04f6ddbf177933f4af933393c2 +MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-0.5.5-r1.ebuild b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-0.5.5-r1.ebuild index fe58f24..e725992 100644 --- a/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-0.5.5-r1.ebuild +++ b/dev-vcs/gitlab-ci-multi-runner/gitlab-ci-multi-runner-0.5.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI="5" @@ -8,18 +8,15 @@ inherit eutils user DESCRIPTION="GitLab CI Multi Runner is the new build processor needed for GitLab CI >= 7.12" HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci-multi-runner" -SRC_URI="x86? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-386 -> ${P}-x86 ) - amd64? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-amd64 -> ${P}-amd64 ) - arm? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-arm -> ${P}-arm )" +SRC_URI="x86? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-386 -> ${P}-x86 ) + amd64? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-amd64 -> ${P}-amd64 ) + arm? ( https://${PN}-downloads.s3.amazonaws.com/v${PV}/binaries/${PN}-linux-arm -> ${P}-arm )" RESTRICT="mirror" -REQUIRED_USE="^^ ( x86 amd64 arm )" - LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="amd64 arm x86" +KEYWORDS="~amd64 ~x86 ~arm" DEPEND="dev-vcs/git" RDEPEND="${DEPEND} @@ -40,9 +37,9 @@ pkg_setup() { } src_unpack() { - local a="$(usev amd64)$(usev arm)$(usev x86)" - mkdir -p "${S}" - cp "${DISTDIR}/${P}-${a}" "${S}/${PN}" + local a="$(usev amd64)$(usev arm)$(usev x86)" + mkdir -p "${S}" + cp "${DISTDIR}/${P}-${a}" "${S}/${PN}" } src_prepare() { diff --git a/dev-vcs/gitlab-ci-multi-runner/metadata.xml b/dev-vcs/gitlab-ci-multi-runner/metadata.xml new file mode 100644 index 0000000..1315b88 --- /dev/null +++ b/dev-vcs/gitlab-ci-multi-runner/metadata.xml @@ -0,0 +1,8 @@ + + + + + manuel@fritteli.ch + Manuel Friedli + + diff --git a/dev-vcs/gitlab-git-http-server/Manifest b/dev-vcs/gitlab-git-http-server/Manifest index eccdbfb..22f0468 100644 --- a/dev-vcs/gitlab-git-http-server/Manifest +++ b/dev-vcs/gitlab-git-http-server/Manifest @@ -2,4 +2,5 @@ AUX fix-Makefile-0.2.10.patch 386 SHA256 16a0441a38a057773859af0a50f6f21fa1220c9 AUX gitlab-git-http-server.conf 254 SHA256 b0c0a9a0c6db8743f46e38124ad3591f5f4e3b7d0cf1e0ff6a426504d85a1006 SHA512 9a6948e6491727737fb4faf12238e459992f95a8011726badba7202a8e3a409a4fd34d7a78b933e473bf0b6516d54c08b5905e35e304e022b5d9d2a8f7e38e62 WHIRLPOOL 1d2b11f973f7a0249a75df929c1f71f36c59bc0b7537cb7aed598dc40cb0ca581b9443eb499f2894069f3857d89c058fa3fd01418bbdab40b16a9896e83a52d2 AUX gitlab-git-http-server.init 688 SHA256 58b3c644bed79d5450aa45a50ba2ee625d510b3670721b15f421990808747efe SHA512 d954e41b30704edd1e0f631ab5f1969fdf46e783dbcf57d1d18ac98c141ce5d692fcd92a3f8b8f36a9836fb195fddb5d57d3420118d97732ed966c3623947495 WHIRLPOOL 43cb019f14d0987b1e31903fafef9cbda254006f2ba0b73a7e95733bd75845dbe9385a2e42bc1a16bedf3921b538afbac9c36305c839ced8f085d8315c325028 DIST gitlab-git-http-server-0.2.10.tar.bz2 7150 SHA256 13a43078c2fe321c83c4af61db087ed5f1bef443a866dd05704717e197ce8f2a SHA512 faae12473e3994bfed31c7b13ad20e30f74a954db1b622ff911dce9be4dbc1a54a0ee4d0e9706f443928ad72ea810184360c590251e8012a882e8dea1538878b WHIRLPOOL c0b8ad7143bfc40b0540a5dd3466eb26b8698a3aa307a0086020d42968d23f785b4a22309b04f6923e6003efa53dc4a4412ec13fb7ec5c21f54220d04d786032 -EBUILD gitlab-git-http-server-0.2.10.ebuild 895 SHA256 01ced6a0eab0c9498ccc3ca79590f658c841107281d20adc53010e3b3556c2cc SHA512 449901045d161c544af1a239656f4fb54f67c9ff106fdec40c45e07062385f6249ad73078d69d63ede95912b6b636d1d0beb569a41df1ea997fcec38b8d97532 WHIRLPOOL 6530fa680fa0c1d6fb025b35e15daa7948887fa9dc5996602a3918bd6f52740616a497840deeb78fd5de114c9d6284ff33f14c685e8699b665500e81c03856ff +EBUILD gitlab-git-http-server-0.2.10.ebuild 889 SHA256 c562c473a7755fbffc39b368df0c06ee77773630e32fc86254a4d98de5cdf5c3 SHA512 30249f99c649137a0ee7a799bae2b65549e5362adf6b1064b8c9eec40fa4a48ef17db1827d03a2e13316306a913e616a800bb09c7a5dabafdf851972796f920c WHIRLPOOL dc140bb370ff1ca7149506542c0f98de35a9821b3d3795e414a9882fa05587928291f4e974e45249dfcb9eca6b7655efa531463ac51ab67200d7878764fc867e +MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/dev-vcs/gitlab-git-http-server/gitlab-git-http-server-0.2.10.ebuild b/dev-vcs/gitlab-git-http-server/gitlab-git-http-server-0.2.10.ebuild index 1393272..b679475 100644 --- a/dev-vcs/gitlab-git-http-server/gitlab-git-http-server-0.2.10.ebuild +++ b/dev-vcs/gitlab-git-http-server/gitlab-git-http-server-0.2.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI="5" diff --git a/dev-vcs/gitlab-git-http-server/metadata.xml b/dev-vcs/gitlab-git-http-server/metadata.xml new file mode 100644 index 0000000..1315b88 --- /dev/null +++ b/dev-vcs/gitlab-git-http-server/metadata.xml @@ -0,0 +1,8 @@ + + + + + manuel@fritteli.ch + Manuel Friedli + + diff --git a/dev-vcs/gitlab-shell/Manifest b/dev-vcs/gitlab-shell/Manifest index d90fec0..a9946cf 100644 --- a/dev-vcs/gitlab-shell/Manifest +++ b/dev-vcs/gitlab-shell/Manifest @@ -1,3 +1,4 @@ AUX gitlab-shell-2.0.0-config-paths.patch 1356 SHA256 442a8e18b4d8e6092db0d39659cba5e41404e90f21070ed50b5460177f28f1b2 SHA512 0445cd42086b2d77825c487d604ddcb11f8fdf4eb8dcdfa1fe1b8e8c24d7b8f273834dbec0bfbb763a35a74605d558cc8d3feaa056eb02a113d18124a764551e WHIRLPOOL 0e3367b229ea4f13818fe2e485dc8da83ad695aec496881cb5eb918b183029b0013518ca64acba1568d93dc418dfaf083c2a86b9f2e3adf9fe15cad038011b30 DIST gitlab-shell-2.6.5.tar.gz 33445 SHA256 586092a62b053adf0b046372aa5983b1170446456cd24e63c145460acc927648 SHA512 52f5c1db5b813dcd68183c6ca02e1fa0eb693040d2e6dedbb903743c285feaddd2a2836726228673eb6da99da07fcd04103e9207443b9f4fb42ba6d1bd4e29db WHIRLPOOL f52937b73942bd2064bc4414f9d4c8b34366dac59912ee926347ba02b7d44c28630a8f530beea82c3df5b6b801db5249080269a9a4e2f8daf33c484a3d203754 -EBUILD gitlab-shell-2.6.5.ebuild 3500 SHA256 8de274d1be0c80ad57639ade47a6ca9d4446aed136a8cf75d6d821a3e9c414cf SHA512 10f1720fdcdbf96f95b9c5c5e2d396d49b1012bb7dc41c8cea3d9b9d3add0c7dc9574b47a90790e189e755ca8097c076a92cb279291f7112af1bfe5c6fd15fdd WHIRLPOOL affb0799af07ee36201eb5594296a74eb279d176b1713f6566cec067db5b4749057c5189b291f9fe28d94bb35e1e8e7d5baa6f00915ef9fa220199b3ed2b66c6 +EBUILD gitlab-shell-2.6.5.ebuild 3494 SHA256 18b44221e71ae92d0c6d7d5d12a895a2241b9fd51f3eb081e50ff49c36e6e13e SHA512 3b33ff20e643bd8a9b66b2c4830bd3c43b38707306adca5522cf428699fd83d8b16d3c55bc5c86c022afc50a3b5fe913ff1d7b903313ebbac72131831be8a6bc WHIRLPOOL 36ccf083f951ef9b1a432dc9d543bd0111a0abab3b7299b2ff40657a5ae725adcb9aa414610f43f8624045317d044aab4aa86f1245024ec57774083f56861a44 +MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/dev-vcs/gitlab-shell/gitlab-shell-2.6.5.ebuild b/dev-vcs/gitlab-shell/gitlab-shell-2.6.5.ebuild index ef904e0..bdcb0a4 100644 --- a/dev-vcs/gitlab-shell/gitlab-shell-2.6.5.ebuild +++ b/dev-vcs/gitlab-shell/gitlab-shell-2.6.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI="5" diff --git a/dev-vcs/gitlab-shell/metadata.xml b/dev-vcs/gitlab-shell/metadata.xml new file mode 100644 index 0000000..1315b88 --- /dev/null +++ b/dev-vcs/gitlab-shell/metadata.xml @@ -0,0 +1,8 @@ + + + + + manuel@fritteli.ch + Manuel Friedli + + diff --git a/games-rpg/ankh/Manifest b/games-rpg/ankh/Manifest index ddd5184..fb66a47 100644 --- a/games-rpg/ankh/Manifest +++ b/games-rpg/ankh/Manifest @@ -1 +1,2 @@ -EBUILD ankh-1.0.ebuild 1649 RMD160 cc1aa30ebf653b8ee20844afb77fe7cc708a3b15 SHA1 d292b1f221731de16f1df825406da95ea2ffbdd5 SHA256 d83a089fbebe2b32f2353d67f790e176c8fee4c467b5412badf5baf13e3d583b +EBUILD ankh-1.0.ebuild 1873 SHA256 93a3b8f2e43d0639cc6ad98b85a6eb5ba7ed1f4b8c44f6a11274747cde1b6282 SHA512 7a96bfbe33c1ca7f407c032e48d9dc2a70cde38b4db7ebc639b978e1d58cced8221acc23578d262ec228bed3d1fd875db3de06757159f2347d7acce0c0172ed5 WHIRLPOOL 5bde0cc3678a763f0655898bc86fdaafc876167c2c8eb619277911e46a751da897588fdc40002cfd784bd79fc8658912dd58bf662509f43f58f6957231522228 +MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/games-rpg/ankh/ankh-1.0.ebuild b/games-rpg/ankh/ankh-1.0.ebuild index d887ca1..65a0fdf 100644 --- a/games-rpg/ankh/ankh-1.0.ebuild +++ b/games-rpg/ankh/ankh-1.0.ebuild @@ -1,30 +1,49 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + inherit eutils games DESCRIPTION="Ankh a Adventure like Monkey Island" HOMEPAGE="http://www.ankh-game.de/ankh.html" +LICENSE="all-rights-reserved" -LICENSE="Runesoft" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="-* ~amd64 ~x86" +IUSE="+abi_x86_32" RESTRICT="strip" +ABI="x86" + +REQUIRED_USE="abi_x86_32" DEPEND="app-arch/bzip2 - app-arch/tar - app-arch/unzip" + app-arch/tar + app-arch/unzip" RDEPEND="sys-libs/glibc - virtual/opengl - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - amd64? ( app-emulation/emul-linux-x86-xlibs - app-emulation/emul-linux-x86-soundlibs - || ( - >=app-emulation/emul-linux-x86-xlibs-7.0 - x11-drivers/nvidia-drivers - x11-drivers/nvidia-legacy-drivers - >=x11-drivers/ati-drivers-8.8.25-r1 ) )" + amd64? ( + virtual/opengl[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + || ( + x11-drivers/nvidia-drivers[multilib(-)] + x11-drivers/ati-drivers[abi_x86_32(-)] + ) + ) + x86? ( + virtual/opengl + x11-libs/libXext + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + || ( + x11-drivers/nvidia-drivers + x11-drivers/ati-drivers + ) + )" S=${WORKDIR} @@ -32,28 +51,26 @@ GAMES_CHECK_LICENSE="no" dir=${GAMES_PREFIX_OPT}/ankh Ddir=${D}/${dir} - - src_install() { - cdrom_get_cds data/Ankh.tar.gz - insinto "${dir}" - exeinto "${dir}" - einfo "Unpacking common.zip from Disk..." - unzip -qo ${CDROM_ROOT}/data/common.zip -d $Ddir - einfo "Unpacking bin-x86.tar.gz from Disk..." - tar xzf ${CDROM_ROOT}/data/bin-x86.tar.gz -C $Ddir - einfo "Unpacking libs-x86.tar.gz from Disk..." - tar xzf ${CDROM_ROOT}/data/libs-x86.tar.gz -C $Ddir - einfo "Unpacking Ankh.tar.gz from Disk..." - tar xzf ${CDROM_ROOT}/data/Ankh.tar.gz -C $Ddir + cdrom_get_cds data/Ankh.tar.gz + insinto "${dir}" + exeinto "${dir}" + einfo "Unpacking common.zip from Disk..." + unzip -qo "${CDROM_ROOT}"/data/common.zip -d "$Ddir" + einfo "Unpacking bin-x86.tar.gz from Disk..." + tar xzf "${CDROM_ROOT}"/data/bin-x86.tar.gz -C "$Ddir" + einfo "Unpacking libs-x86.tar.gz from Disk..." + tar xzf "${CDROM_ROOT}"/data/libs-x86.tar.gz -C "$Ddir" + einfo "Unpacking Ankh.tar.gz from Disk..." + tar xzf "${CDROM_ROOT}"/data/Ankh.tar.gz -C "$Ddir" - find ${Ddir} -exec touch '{}' \; - # Argh the Program saves the settings in his install dir :( - # so we have to set some dir to be writeable by the group - chmod g+w ${Ddir}/media/ # the settings are saved here - chmod g+w ${Ddir}/bin/release # the log-files are saved here - dosym ${dir}/Ankh /usr/games/bin/ankh + find "${Ddir}" -exec touch '{}' \; + # Argh the Program saves the settings in his install dir :( + # so we have to set some dir to be writeable by the group + chmod g+w "${Ddir}"/media/ # the settings are saved here + chmod g+w "${Ddir}"/bin/release # the log-files are saved here + dosym "${dir}"/Ankh /usr/games/bin/ankh - prepgamesdirs - make_desktop_entry ankh "Ankh" ${dir}/Ankh.xpm -} \ No newline at end of file + prepgamesdirs + make_desktop_entry ankh "Ankh" "${dir}"/Ankh.xpm +} diff --git a/games-rpg/ankh/metadata.xml b/games-rpg/ankh/metadata.xml new file mode 100644 index 0000000..1315b88 --- /dev/null +++ b/games-rpg/ankh/metadata.xml @@ -0,0 +1,8 @@ + + + + + manuel@fritteli.ch + Manuel Friedli + + diff --git a/media-fonts/andalus/Manifest b/media-fonts/andalus/Manifest index fc72821..a903a6b 100644 --- a/media-fonts/andalus/Manifest +++ b/media-fonts/andalus/Manifest @@ -1,2 +1,3 @@ -DIST andalus.zip 52912 SHA256 defac8411a7e77a5b8345957a60d461eccbda386f59b3872ea1ab3c8bcd9e4fe -EBUILD andalus-1-r1.ebuild 703 SHA256 e225d90a7228e88a0c88073cc52661fb358a07bfb23fdcc92706521dd015e4fa SHA512 5b42c943d41ed85a6d9e4778d8f112ac4388c6a040e517cf0eebb0a9ac681e8b0b77bc52f99803b5911cc4ab394042fc24b07794d2f49465e03b1b0bfd1aeb14 WHIRLPOOL 35cfbecb98e23a6e17ab63e740d4398b4ac6cc5f3250fd6db3faa09971f782a1ed88899cffe0b21161f7cae084253b43a963cdc57559cbe7228a90a2330e2830 +DIST andlso.ttf 158956 SHA256 29eedc86c06288ac5c3786cff85b1de3fa320e172eba267df46c50dd70b30999 SHA512 085da209e4927c8ad5635a71e720e136b4e699cb8d9a0122bfc9911bf46c65f1404b842538395549fa9ce0ade15f9e425ccb80011799453f2a93f8f3469594c1 WHIRLPOOL c7599cc53c6b4e32b500a4c71d2b646b8ede872847e8a8f69c3a88964008dbd62bde12765e8978de24f7b722161e009665d060864eb25fa3eb3a2360ad66ff88 +EBUILD andalus-1-r1.ebuild 611 SHA256 9455008677d4f283459f17b31d83c3e19a77881c96fd37e4db7851fa33f62a59 SHA512 8270beaeef7ae5cbe2801aae876e6ec9b76e21b147673170135e0bcc689f7db3e206e3d69f5fe8f0808dab2e2c092fc73e763de8152f5511ff81d0b678224504 WHIRLPOOL 6eba9d47b754290377905528409137f2f82d4992c5a1e0d8a7b1c9414d6dda417c61e5a5f1ff5025dedbb2624127f14b23df0a410406a7f3da5ab9e0b0a52904 +MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/media-fonts/andalus/andalus-1-r1.ebuild b/media-fonts/andalus/andalus-1-r1.ebuild index ad42247..458d20a 100644 --- a/media-fonts/andalus/andalus-1-r1.ebuild +++ b/media-fonts/andalus/andalus-1-r1.ebuild @@ -1,33 +1,33 @@ -# Copyright 2011 Manuel Friedli -# This ebuild is distributed under the terms of the GNU General Public License v2 +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 # $Id$ +EAPI="5" + inherit font MY_PN="andalus" MY_P="${MY_PN}" S="${WORKDIR}" DESCRIPTION="Andalus Truetype Font" -HOMEPAGE="http://www.fonts101.com/xt_fontdetails_az_FID!19125~Andalus~font.html" -SRC_URI="http://www.fonts101.com/andalus.zip" +HOMEPAGE="http://fontzone.net/font-download/andalus" +SRC_URI="http://fontzone.net/downloadfile/andalus -> andlso.ttf" +LICENSE="public-domain" -LICENSE="Unknown" SLOT="0" KEYWORDS="~x86 ~amd64" -RESTRICT="fetch nomirror" +RESTRICT="fetch" IUSE="" -DOCS="fonts101.txt" FONT_SUFFIX="ttf" FONT_S="${S}" -DEPEND="app-arch/unzip" +RDEPEND="" pkg_nofetch() { einfo "Please download ${MY_P} from here:" - einfo "http://www.fonts101.com/xt_fontdetails_az_FID!19125~Andalus~font.html" + einfo "http://fontzone.net/font-download/andalus" } #src_unpack() { # unzip $A #} - \ No newline at end of file diff --git a/media-fonts/andalus/metadata.xml b/media-fonts/andalus/metadata.xml new file mode 100644 index 0000000..1315b88 --- /dev/null +++ b/media-fonts/andalus/metadata.xml @@ -0,0 +1,8 @@ + + + + + manuel@fritteli.ch + Manuel Friedli + + diff --git a/media-fonts/snowflake-letters/Manifest b/media-fonts/snowflake-letters/Manifest index c27ba90..df4a6ba 100644 --- a/media-fonts/snowflake-letters/Manifest +++ b/media-fonts/snowflake-letters/Manifest @@ -1,2 +1,3 @@ DIST Snowflake-Letters.zip 142677 SHA256 dfbe1aaeae3b02c534bae555e988d2d872aca8868a30688329401530b2db92e2 -EBUILD snowflake-letters-1-r1.ebuild 684 SHA256 4ee4b3fe5abd639bdb14fefc5b5b95ad88f4381990c7efac7650f44ba9b6fe57 SHA512 bc60228df31d5b25fa8a7d287b73efd2965def80bab83d4f8bfa1b6298132c1d05a7d70e9ff5425bba3c3ccb430907edbfd88998775f61d8e55ab55ecaf9d25a WHIRLPOOL 3f4352cf59526e284ee9a1556800b8c2fa310484b65661a95cde21c056f5079a1258c2677e8c30d34683b3f62d070f2bd474034c91952622952b46a1d9be500e +EBUILD snowflake-letters-1-r1.ebuild 658 SHA256 790f74f28a57666d671d22b8776fa76c00af39f92336f4fea7ec1c3786b67e4c SHA512 f439e0464d81b7ebb691fa1742cda50462277c45c70d26d3904edd952093a2969647b15d784b27ca21ad2de81d085266d5b14351d881723a8b11098f6a612f05 WHIRLPOOL 3c4dd872565cb2c2bb893a398cd3a66c3ebd85ee99ffe829f5b2bbaa057d27683ba0393a0f4d5cd2c34e5738288de6aee5551664022a4fb2676c888759c51863 +MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/media-fonts/snowflake-letters/metadata.xml b/media-fonts/snowflake-letters/metadata.xml new file mode 100644 index 0000000..1315b88 --- /dev/null +++ b/media-fonts/snowflake-letters/metadata.xml @@ -0,0 +1,8 @@ + + + + + manuel@fritteli.ch + Manuel Friedli + + diff --git a/media-fonts/snowflake-letters/snowflake-letters-1-r1.ebuild b/media-fonts/snowflake-letters/snowflake-letters-1-r1.ebuild index b772690..cd9c95d 100644 --- a/media-fonts/snowflake-letters/snowflake-letters-1-r1.ebuild +++ b/media-fonts/snowflake-letters/snowflake-letters-1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 2008 Manuel Friedli -# This ebuild is distributed under the terms of the GNU General Public License v2 -# $Header: $ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ inherit font @@ -10,17 +10,18 @@ S="${WORKDIR}" DESCRIPTION="Snowflake Letters Truetype Font" HOMEPAGE="http://www.fontstock.net/9746/Snowflake-Letters.html" SRC_URI="http://www.fontstock.net/font/9746/Snowflake-Letters.zip" +LICENSE="public-domain" -LICENSE="Unknown" SLOT="0" KEYWORDS="~x86 ~amd64" -RESTRICT="fetch nomirror" +RESTRICT="fetch" IUSE="" DOCS="fonts101.txt" FONT_SUFFIX="ttf" FONT_S="${S}" DEPEND="app-arch/unzip" +RDEPEND="" pkg_nofetch() { einfo "Please download ${MY_P} from here:" diff --git a/net-im/palaver/Manifest b/net-im/palaver/Manifest index 40e367b..0a6fc85 100644 --- a/net-im/palaver/Manifest +++ b/net-im/palaver/Manifest @@ -3,5 +3,6 @@ AUX palaver-initd 650 SHA256 3db70d01fc2958858a08b1f7fb26af56aedc28e2d1c99f5cd1b AUX palaver.conf 116 SHA256 4c532034298f197a7810463d9f0a850e8118b96f50efd850f65097c017622d9f SHA512 f34536040a13bce8e419559b59058d930ae851917fedb150b3c9c4315f7946be9ca56af28841fa86ee1b3252b98eadcb01d3bb87a73e77917d59646fbb6871f2 WHIRLPOOL 26a61f877c6dbf6dc08f39dc0164c1672a4b050073ecb99b3b331ff7152fee4ff198ec4faf829018870a2022ebcf8e03eed9b1b8a02d47d032284741978d0c33 AUX palaver_plugin.py 1222 SHA256 f9e81c27fb210799739ed36964b203a3ebde15584f9499d965db20e63eeeddf0 SHA512 5957e52274f38d82f3c897b24b8588eeb6a93eb9a04c2a421e9f95eab1a451da4bf1b944f19914163c9e925eaf37fb9fe6b332866859c22df40216d447a505ce WHIRLPOOL 9cf4778eaf45c556456c79764bc630d268fd0e2dbcb189d4af88b5664aeae0b3e91ee0af98e9666c9b160e454456fc7781e0bacd33dd7dcc0f40ff4d6d1ad427 DIST palaver-0.6.tar.gz 118665 SHA256 0bcb8ff9834b8db905fa2c1a06f84a50bc9a459a326c6d67a10ac7a08f841e7a SHA512 adb1417802c845762ce4ed476cae0695fb21c22fc2454913ea103ee54f71c71da18186f92da3ce3cb05734c3f8ad58df0964b30f6c8984239cf365bfaeed84ec WHIRLPOOL b2848d97ee1861ecc07446ef2f83ae73063edf105706b8126575926b2820ca958e9901fd2d67c8c38577fdd489d1c3eec4fd711458357a911077341ab42c1e12 -EBUILD palaver-0.6.ebuild 1203 SHA256 4ed5728bc1fe2ae6cc970c75ab6faeae2d95b16836ddb6c8071c25d20fb7298f SHA512 a6e7f0558c8ba75bf503cd541c544047ea512d6bbba29114597997c961d5d624701474612f0057924a6cc71aeb83796c422e5f3d275b9a6c5b1b9a900a640cf4 WHIRLPOOL ba6b5327f48227c86384bfb18511a2a07a267dababa2c2d098384aee0fdceb1727106f513891a5420e1930e970d6f73d416c8bd9e9f132174f83ef24e558d62c -EBUILD palaver-9999.ebuild 1177 SHA256 2baca9ff7feed0f237ab9b1c5a5158605c2cb3b84caaad514d245b7e0e86c63e SHA512 b6ad1d536c73977f4b533097dd31e06cb87d5bac12fd1b2eaab60ba4f1cb8b245e673d95484ae3aafa9f928f0b26a719b1f76896dafc450a2ae0e4d9fc037239 WHIRLPOOL 937cc926fdcfcea8835e232b6739c43de099fdbf4964927e65edf5b1cf789f39c9695150d6a74eca807bbb8c619d25b8bdaf14e5a5c25ff86ad3a3e3fc3c0aa7 +EBUILD palaver-0.6.ebuild 1231 SHA256 e6db885357bdd621946f97e3c40fd86b75d2427a061f0a3ad29d1bd301127818 SHA512 e2212246321a25f515e47159c963228b7ab7704b0415b295d1d326b5689e001501fda31998f764158add25652b13555d03dc96153018986b367e969556987fbc WHIRLPOOL 105ee3bbd20b1227e639a3828aab70e3640d25aeb23f238bcb08f9d0e65fc3ca6ff34a6b8e96fdc29c5f5ba3955e745a0c965d3bc3d4f545d0fe844e2d4241b3 +EBUILD palaver-9999.ebuild 1205 SHA256 69cbf5d15a32ff128c93643a2fd8eacbdeaacbc25c285f32390c61fd63a7f1af SHA512 698c957f4493e202601e9d609742ebada0fac9f72d9f37c6731b5404fab76a12f7810d14e1a1c2ef74e8e6370faaa6d55bd6cf2013bd97e569f06de6212f28c7 WHIRLPOOL b8272cea4097f4730e208ae560f3a189ed5e9f8c2b4c6af7565ddb4f0bebeb0d0b5600b3efdcadb0c7ae4c2d8f664a5e93c9a9be89468bec11dfb9f0c6aaf196 +MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/net-im/palaver/metadata.xml b/net-im/palaver/metadata.xml new file mode 100644 index 0000000..1315b88 --- /dev/null +++ b/net-im/palaver/metadata.xml @@ -0,0 +1,8 @@ + + + + + manuel@fritteli.ch + Manuel Friedli + + diff --git a/net-im/palaver/palaver-0.6.ebuild b/net-im/palaver/palaver-0.6.ebuild index 4a0dda0..91693a2 100644 --- a/net-im/palaver/palaver-0.6.ebuild +++ b/net-im/palaver/palaver-0.6.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI=5 PYTHON_DEPEND="2" +PYTHON_COMPAT=( python2_7 ) -inherit distutils eutils python +inherit distutils-r1 eutils python-r1 DESCRIPTION="Multi-user chat component for jabber implemented in python" HOMEPAGE="https://github.com/fritteli/palaver" SRC_URI="https://github.com/fritteli/palaver/archive/${PV}.tar.gz -> ${P}.tar.gz" diff --git a/net-im/palaver/palaver-9999.ebuild b/net-im/palaver/palaver-9999.ebuild index c97e0fb..04da13c 100644 --- a/net-im/palaver/palaver-9999.ebuild +++ b/net-im/palaver/palaver-9999.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI=5 PYTHON_DEPEND="2" +PYTHON_COMPAT=( python2_7 ) -inherit distutils eutils python git-2 +inherit distutils-r1 eutils python-r1 git-2 DESCRIPTION="Multi-user chat component for jabber implemented in python" HOMEPAGE="https://github.com/fritteli/palaver" EGIT_REPO_URI="git://github.com/fritteli/palaver" diff --git a/net-im/punjab/Manifest b/net-im/punjab/Manifest index ecce90f..a068951 100644 --- a/net-im/punjab/Manifest +++ b/net-im/punjab/Manifest @@ -1,3 +1,4 @@ AUX punjab-confd 67 SHA256 2951827630ccbd793922d32f7f61416747c50ebb2cd542062f1dd82dc9ec94c7 SHA512 9784f2b70cc5830b44702ad74d5b18475fb081f5728ac346746b3f347a9a33771680752a29e42e13b9d2ce7eb983babe22486945b2be22dbfbff6078e8a837ba WHIRLPOOL cb64ecbcd7710d0a6f33ece9bb851a829a6e8c1a978235f7e96f882d69b63ab172a69e4c04c38adc07758fcf39fa0ebebf8f3a40821d7295746378d91d3f98dc AUX punjab-initd 621 SHA256 4263b2f8a2abad5317d1555005ec7038478494fa450918e80f065a488ac80e04 SHA512 7e280ca57a8f091e96cc3ff62b9c74fefe858ca2c94ca0c981dfadd0a26c17d4989164acc8a8c1f6bfd734921b7a7307e89b54024c0ea62c32f0cd4bf8ce703a WHIRLPOOL abe9da6820c028a3d474f4c30d990edb5489cc2c261acac6a03fb8a2e450b872e471f91fefd23630f9c707abf91a66558b959df8ab4716a1e31e5adb42748851 -EBUILD punjab-9999.ebuild 1171 SHA256 7031b97a29cce4a90d736fa2752272150f04edfa116f4d822f9db2cec0e8df42 SHA512 7ea1cfdbd80c4092b5bc87787a663d487c0fa08eec27ab0a481f3df8283bb192999e3b879b3875504c8415c26ba6ea3da5fd6d9eb2dea1947fbacd7dbb35c5fb WHIRLPOOL 9ae8059628fdd9a75db092694c47d022831ca632ecb17cd497b6bab469fba58f034b330d54deee9cd8bc03259092e854b6a8fe536a45768a4d51dccd7f2170fd +EBUILD punjab-9999.ebuild 1199 SHA256 079c0885341f550f4efe224e6ad4b079960c52a231cd72afb302847778cd9b70 SHA512 3d418807d12e0f1550f4043ce05b8fa050aa1b02aabcd570030a0a221b906606d23deeb98261ef17ef8c6d5938ee5db0444e0972d066bfa1ab0d8b28a7bf1cff WHIRLPOOL a438483cfa55ad32c78da1556d5567c28692f5f0653630c29d123409d287979b1152abbb5073817c18bb85331b2dfb210ded344b878a549d9607c16625a6db9e +MISC metadata.xml 307 SHA256 c5de1524b4a2f44a68113ee604c2e4917a13f6d3689fe4b3a5b54f0037a083de SHA512 22f5442878e7b227d7ba0cb7393865818474086e26ed8e835903f64af8b9c72c524640a8c4ced599a7181e4f3b4195ce84d026729ad22908832b5a9f31697e4e WHIRLPOOL c759749f423ad411f0f2d2f3fa82b395369c58a6da3aa8efc90831a9238758c4f70d2003cd81512fbbe797b02817cc26ebae76eb917610354ec6f197f139dd17 diff --git a/net-im/punjab/metadata.xml b/net-im/punjab/metadata.xml new file mode 100644 index 0000000..58d12d4 --- /dev/null +++ b/net-im/punjab/metadata.xml @@ -0,0 +1,11 @@ + + + + + manuel@fritteli.ch + Manuel Friedli + + + Enable Transport Layer Security + + diff --git a/net-im/punjab/punjab-9999.ebuild b/net-im/punjab/punjab-9999.ebuild index da43825..6d8bee1 100644 --- a/net-im/punjab/punjab-9999.ebuild +++ b/net-im/punjab/punjab-9999.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ -EAPI=3 +EAPI=5 PYTHON_DEPEND="2" +PYTHON_COMPAT=( python2_7 ) -inherit distutils eutils python git-2 +inherit distutils-r1 eutils python-r1 git-2 DESCRIPTION="BOSH connection manager for jabber implemented in python" HOMEPAGE="https://github.com/twonds/punjab" EGIT_REPO_URI="git://github.com/twonds/punjab" diff --git a/profiles/default/linux/amd64/13.0/no-multilib/package.mask b/profiles/default/linux/amd64/13.0/no-multilib/package.mask new file mode 100644 index 0000000..3103622 --- /dev/null +++ b/profiles/default/linux/amd64/13.0/no-multilib/package.mask @@ -0,0 +1 @@ +games-rpg/ankh diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask new file mode 100644 index 0000000..3103622 --- /dev/null +++ b/profiles/hardened/linux/amd64/no-multilib/package.mask @@ -0,0 +1 @@ +games-rpg/ankh diff --git a/profiles/hardened/linux/amd64/no-multilib/selinux/package.mask b/profiles/hardened/linux/amd64/no-multilib/selinux/package.mask new file mode 100644 index 0000000..3103622 --- /dev/null +++ b/profiles/hardened/linux/amd64/no-multilib/selinux/package.mask @@ -0,0 +1 @@ +games-rpg/ankh diff --git a/sci-geosciences/garminplugin/Manifest b/sci-geosciences/garminplugin/Manifest index 616afe0..c17401b 100644 --- a/sci-geosciences/garminplugin/Manifest +++ b/sci-geosciences/garminplugin/Manifest @@ -1,2 +1,3 @@ DIST garminplugin-0.3.26.tar.gz 164815 SHA256 590ffcd95ff58bb06ad29b688e1b769697dabac6bd500e9bd4aa9c5857d91422 SHA512 4819e10569540b41a8dfc60c3eac7bde04a9a80b711c919a27c3a4183ccd264c39a4d5adc651141d88f317c1b0637eced2368e3f1aabdba7c6728799a43ae519 WHIRLPOOL fa28f52a965c8b1b3be30ee15c1711f0b61bddb0b71bc25140db8f70434526db64569239a57db7d359afde82225e81be9de8bfbe690743ca419d5f508bafa024 -EBUILD garminplugin-0.3.26.ebuild 879 SHA256 a55e2e9c3d3e9f421e71359c30a4ddc0ee734b695f539739d4c2c7d190f4f345 SHA512 dc26b6979a5bced0ea9bb7a49ec0303a02be6e219e2ddc0f325f8bdaaa60fe4ea06d0f623435afcd7dbf330de5ef99dd1e33370c0d88721a78d68840d1f25e50 WHIRLPOOL e1d2b31febdf58afb941722b0b61c3b7ba31464417bd3bd9dd3d133462ab91eab9463bd18333aa714f6f4c295ca9aeee9c9b9f45788470d7c6b13b791162b315 +EBUILD garminplugin-0.3.26.ebuild 888 SHA256 5efb3aa8af1c741686bebe1222fe070c0fb680eed53b7c2519d2684008d5d963 SHA512 fbf2ebf32f10729a4772d2449055905c1a6712e87b2f5da64976ca8ea6a01383d6074477d97f98865be49630c05a25455f9efc450eeb0dee7c9cdc446d1bcbb7 WHIRLPOOL e9f1c8e7ac1d912e1d374631c7876a4fab4591a2cdf0fbbcd91ae08fb8a1d394f41293faa8c9449a780e0a7130dd8b042fcb7f48bd6a670d7c7c575d1f0048be +MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/sci-geosciences/garminplugin/garminplugin-0.3.26.ebuild b/sci-geosciences/garminplugin/garminplugin-0.3.26.ebuild index aef3221..56c1452 100644 --- a/sci-geosciences/garminplugin/garminplugin-0.3.26.ebuild +++ b/sci-geosciences/garminplugin/garminplugin-0.3.26.ebuild @@ -1,5 +1,6 @@ -# Copyright 2011 Christian Wasserthal +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# $Id$ EAPI="2" inherit eutils diff --git a/sci-geosciences/garminplugin/metadata.xml b/sci-geosciences/garminplugin/metadata.xml new file mode 100644 index 0000000..1315b88 --- /dev/null +++ b/sci-geosciences/garminplugin/metadata.xml @@ -0,0 +1,8 @@ + + + + + manuel@fritteli.ch + Manuel Friedli + + diff --git a/sci-geosciences/garmintools/Manifest b/sci-geosciences/garmintools/Manifest index 20c6aad..67b5c8e 100644 --- a/sci-geosciences/garmintools/Manifest +++ b/sci-geosciences/garmintools/Manifest @@ -1,3 +1,4 @@ AUX garmintools-0.10-add-xml-root.patch 419 SHA256 58802fbddf121cc9c2236fac5220895248854e438bee2e43a35b2129ffa7f7a2 SHA512 b61dd12999686905869ad3e32324b3f246fda685d79f4e867b4f10c125a89cca105d295b62f6181099b9f014b3c1f97b2a4a5753fb6688842553d83c129b984d WHIRLPOOL 94a6cdfed71066f580925bce4eccd7615364bc9ee836d286f2f7299ea51f9325de9141cd102f6f26d2be65a459c0d480e692509881bb1496278c6ff8a1bd8d53 -DIST garmintools-0.10.tar.gz 396659 SHA256 ffd50b7f963fa9b8ded3223c4786b07906c887ed900de64581a24ff201444cee -EBUILD garmintools-0.10.ebuild 873 SHA256 dbbe9a1f001af7667cf189ac61318faebead1f5136a83f4877da36f885c4a932 SHA512 4602066d00a362917cbf06d59215364ce7f8127d6145696b41801f0ec59ac063be45d017ddd225a225837d6a1228637287df449a0f4fe93e19480e4ee9c4a038 WHIRLPOOL 7291b5eb6985144ae1ec5b54fa4416ea1359c2163e12e5af3da223397c86cd24a46e8debc58ed3ad054987dfefa3efc6be1f4a69df172aa2b6a6f25b01b4d075 +DIST garmintools-0.10.tar.gz 396659 SHA256 ffd50b7f963fa9b8ded3223c4786b07906c887ed900de64581a24ff201444cee SHA512 c0a01c0e73983635501b4d63d7f08f9c3e512c4c899beae96d3fbb69c1e1ff0f5a4f5c82b9cbd243d971986489f7b9fcaf5b6c8381d1212e39074c8973f7136b WHIRLPOOL 976d9470b79c1660d5202346b9e813f6c1737875560a82789038bbdb332e6a8b064f8489008f7d23cb4900c72d7f12aac17b37d13c3682dd4c169400c5420b77 +EBUILD garmintools-0.10.ebuild 893 SHA256 27ac63b861a567c8a489bb02b55c7d4469123560ef639e7a99d7b09d0d4487ee SHA512 2b2815407e099de51302fbd7ed31187e6c4fd8c525a09c256757bf8505adb12719a378951971dfae23abfb3d0cd6a27d1e8a3f727ed8644669df4f03e0c13f77 WHIRLPOOL 456b3d0f4406738cf0f06fc9bf68369858524b25a9d9c542781bf436de52d05e7bc2244628d6e9b77976572097c1b72c8bf6766ddda797f15a0e8a3c36d29248 +MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/sci-geosciences/garmintools/garmintools-0.10.ebuild b/sci-geosciences/garmintools/garmintools-0.10.ebuild index 5227c56..ed306db 100644 --- a/sci-geosciences/garmintools/garmintools-0.10.ebuild +++ b/sci-geosciences/garmintools/garmintools-0.10.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/gpsbabel-1.3.3.ebuild,v 1.3 2007/07/18 02:02:04 cryos Exp $ +# $Id$ EAPI="5" @@ -24,20 +24,26 @@ RDEPEND="usb? ( virtual/libusb:1 )" DEPEND="${RDEPEND}" -src_unpack(){ - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PF}-add-xml-root.patch || die "Unable to apply ${PF}-add-xml-root.patch" +src_prepare() { + epatch "${FILESDIR}"/"${PF}"-add-xml-root.patch || die "Unable to apply ${PF}-add-xml-root.patch" +} + +#src_unpack(){ +# unpack ${A} +# cd "${S}" +# epatch "${FILESDIR}"/${PF}-add-xml-root.patch || die "Unable to apply ${PF}-add-xml-root.patch" +#} + +src_configure() { + local myconf=""; + econf ${myconf} } src_compile() { - local myconf=""; - econf ${myconf} emake || die "emake failed" } src_install() { - cd "${S}" make DESTDIR="${D}" install || die "Install failed" } diff --git a/sci-geosciences/garmintools/metadata.xml b/sci-geosciences/garmintools/metadata.xml new file mode 100644 index 0000000..1315b88 --- /dev/null +++ b/sci-geosciences/garmintools/metadata.xml @@ -0,0 +1,8 @@ + + + + + manuel@fritteli.ch + Manuel Friedli + + diff --git a/www-apps/gitlab-ci/Manifest b/www-apps/gitlab-ci/Manifest index 4e64d0e..06e14ee 100644 --- a/www-apps/gitlab-ci/Manifest +++ b/www-apps/gitlab-ci/Manifest @@ -2,6 +2,7 @@ AUX gitlab-ci-unicorn.init 1700 SHA256 ad75c1774db69d2ceae61983ba7227bb840c761d6 DIST gitlab-ci-7.14.3.tar.gz 1103513 SHA256 89731e2338b08a811472e0e1b64966789021e1c88f880fea9c38e90cc807651b SHA512 74c96c36d892f88f204466e99020dcf1438605bf85714484cdac442b04e6590cd79af2e97c1f738a2c2d32f81e1007d5563e6a32f2f165c6f42e76f4f53da479 WHIRLPOOL 37f13ccfae347d3e67b8de2ebacedcd5ca18edc5149326dbc5a512d3f3531df6b4b87a8430fdfe7280ded1ea694da4898504786a1b157f967214cf52ca72a58b DIST gitlab-ci-8.0.2.tar.gz 1110587 SHA256 002b0df9c1adf8958626e86d965035c7cba33e2e0d9503f624c75f70d31aa306 SHA512 e32245e3ff54ed9b22d43e1164e0f5b289458c27f6993937ae7c30c9a22ba59d587925723822428e8a692cbd5c7542269fdc6db4d0906ab8a319975311fd2b25 WHIRLPOOL f0528f67d4fbe41449c41726d0f3c2bf7d26a2f218ddeb4eaa94f0845854d8684e0a74e63b1c6b65ccc1aeed5dc8e611e48d626329b4eec5ce02289ac16f8a2e DIST gitlab-ci-8.0.3.tar.gz 1110721 SHA256 c5a6735462f180e89a18d2561a0754f3ee127c593768fad288f44482b8bd2b0c SHA512 c0fcaae82a36cd0f8b07c01ecd4bc2a7d1b0d736e34015b39260c56293465b356997f419d2c9c2636c8930898486da0036aadeb156d54232ead945fae2051754 WHIRLPOOL 81a7dcb223f2613472df242bf062ce22d24259eb5cc26c9c21c5d0e0f6d7b79cdf9948d2aa70b7253937f2c76406ee5a01d227491ae453e8061c9cf3ce8f48b0 -EBUILD gitlab-ci-7.14.3.ebuild 8540 SHA256 82d924f02abdbd68a2b4bafc0b82232ebad5303bb9a9259ec2df70da662a9e40 SHA512 3a9fb89fde76f4e839cfbd23bff299a66d87ecd8e7943f87e4c69e1d25b9679a0fa7feae77264b9d0d5b1f39a529d208fa0d438d7f317b64f1a8b9b509e3e0da WHIRLPOOL 8c985119732f266ab75b901755d2c7f4f3d659767a840487b97fa25f084a136fe287540c0e4a3c19be90e0225561753da6f3979d24d47ca61e74f4ed8f36a67e -EBUILD gitlab-ci-8.0.2.ebuild 8540 SHA256 82d924f02abdbd68a2b4bafc0b82232ebad5303bb9a9259ec2df70da662a9e40 SHA512 3a9fb89fde76f4e839cfbd23bff299a66d87ecd8e7943f87e4c69e1d25b9679a0fa7feae77264b9d0d5b1f39a529d208fa0d438d7f317b64f1a8b9b509e3e0da WHIRLPOOL 8c985119732f266ab75b901755d2c7f4f3d659767a840487b97fa25f084a136fe287540c0e4a3c19be90e0225561753da6f3979d24d47ca61e74f4ed8f36a67e -EBUILD gitlab-ci-8.0.3.ebuild 8540 SHA256 82d924f02abdbd68a2b4bafc0b82232ebad5303bb9a9259ec2df70da662a9e40 SHA512 3a9fb89fde76f4e839cfbd23bff299a66d87ecd8e7943f87e4c69e1d25b9679a0fa7feae77264b9d0d5b1f39a529d208fa0d438d7f317b64f1a8b9b509e3e0da WHIRLPOOL 8c985119732f266ab75b901755d2c7f4f3d659767a840487b97fa25f084a136fe287540c0e4a3c19be90e0225561753da6f3979d24d47ca61e74f4ed8f36a67e +EBUILD gitlab-ci-7.14.3.ebuild 8518 SHA256 6853cc68e4827e78b520ea663c47758928bce522a718e73f8b59b2cf7bec5c50 SHA512 bbd4022b3fd7490ddb58c34521b18f382fc6978edc19de305ea3088c71e74fbe9358061e994de8494b9a3ac8a5a444db393f7b74e486dc43dc1e4758ede14aa0 WHIRLPOOL fd3a4005db3a4b29dc23a6f19b4f7e63437061ab288d0489e7b1df2fe5441e54a8b29cb4c32765755b1672202477e33cccfb77d4a1fbd1e97b4d672775216205 +EBUILD gitlab-ci-8.0.2.ebuild 8519 SHA256 8231729af3db8e94c8bb10d9e196cce7a4e17f9f3b1597946f170bfb9b35ff5a SHA512 f98e24850e0759afb35314fb449a1eda6f4e10babbdf03034c2de32d2955402bedc916c8c337b8164f39d49fa38a2bf4d14b2d47235692d8ef10080e9380ae73 WHIRLPOOL 3b1be080fb47dd3f8e428cafa2e7f2ee060aaead0b6b68108e7c35ff767dfd1ce2a32eb79f4473a9e63201bd86859d65e87f4075808768294a0a54aefb750713 +EBUILD gitlab-ci-8.0.3.ebuild 8519 SHA256 8231729af3db8e94c8bb10d9e196cce7a4e17f9f3b1597946f170bfb9b35ff5a SHA512 f98e24850e0759afb35314fb449a1eda6f4e10babbdf03034c2de32d2955402bedc916c8c337b8164f39d49fa38a2bf4d14b2d47235692d8ef10080e9380ae73 WHIRLPOOL 3b1be080fb47dd3f8e428cafa2e7f2ee060aaead0b6b68108e7c35ff767dfd1ce2a32eb79f4473a9e63201bd86859d65e87f4075808768294a0a54aefb750713 +MISC metadata.xml 234 SHA256 f35b97f99a26d73cc441e1d93bfe25aaa4e9f7f6d90c8d05a74f7b7bc5b68472 SHA512 59d8156b3ca3e99c40d5a2a32de7edf2eb53279b2424998862589d6bad77617d23fc852afec0a92f8ac5bb54a88ebc504cc0641029c1936412e90ab03dfdd447 WHIRLPOOL 935a1401910a42f888c991e443a49275ea8b87976c5aa977f670053d97d18754231749749bc92d37d4b5f45ecf65914480942a11b5827b6c08fb24313a428431 diff --git a/www-apps/gitlab-ci/gitlab-ci-7.14.3.ebuild b/www-apps/gitlab-ci/gitlab-ci-7.14.3.ebuild index f8be13b..0a063c3 100644 --- a/www-apps/gitlab-ci/gitlab-ci-7.14.3.ebuild +++ b/www-apps/gitlab-ci/gitlab-ci-7.14.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI="5" @@ -12,9 +12,9 @@ EAPI="5" # USE_RUBY="ruby21" -PYTHON_DEPEND="2:2.7" +PYTHON_COMPAT=( python2_7 ) -inherit eutils python ruby-ng user +inherit eutils python-r1 ruby-ng user DESCRIPTION="GitLab CI is a continuous integration server that is tightly integrated with GitLab" HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci" @@ -38,7 +38,7 @@ GEMS_DEPEND=" dev-libs/icu dev-libs/libxml2 dev-libs/libxslt - postgres? ( dev-db/postgresql ) + postgres? ( >=dev-db/postgresql-9.1:* ) mysql? ( virtual/mysql )" DEPEND="${GEMS_DEPEND} dev-vcs/git" @@ -210,11 +210,11 @@ pkg_postinst() { elog "haven't done so already." elog if use postgres; then - elog "If you have local PostgreSQL running, just copy&run:" - elog " su postgres" - elog " psql -c \"CREATE ROLE gitlab_ci PASSWORD 'gitlab_ci' \\" - elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" - elog " createdb -E UTF-8 -O gitlab_ci gitlab_ci_production" + elog "If you have local PostgreSQL running, just copy&run:" + elog " su postgres" + elog " psql -c \"CREATE ROLE gitlab_ci PASSWORD 'gitlab_ci' \\" + elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" + elog " createdb -E UTF-8 -O gitlab_ci gitlab_ci_production" elog " Note: You should change your password to something more random..." elog fi @@ -231,11 +231,10 @@ pkg_config() { if [ ! -r "${CONF_DIR}/database.yml" ]; then eerror "Copy ${CONF_DIR}/database.yml.* to" - eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" + eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" eerror "database settings for \"production\" environment."; die fi - local email_from="$(ryaml ${CONF_DIR}/application.yml production gitlab_ci email_from)" local gitlab_ci_home="$(egethome ${MY_USER})" diff --git a/www-apps/gitlab-ci/gitlab-ci-8.0.2.ebuild b/www-apps/gitlab-ci/gitlab-ci-8.0.2.ebuild index f8be13b..0d18f34 100644 --- a/www-apps/gitlab-ci/gitlab-ci-8.0.2.ebuild +++ b/www-apps/gitlab-ci/gitlab-ci-8.0.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI="5" @@ -12,9 +12,9 @@ EAPI="5" # USE_RUBY="ruby21" -PYTHON_DEPEND="2:2.7" +PYTHON_COMPAT=( python2_7 ) -inherit eutils python ruby-ng user +inherit eutils python-r1 ruby-ng user DESCRIPTION="GitLab CI is a continuous integration server that is tightly integrated with GitLab" HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci" @@ -38,7 +38,7 @@ GEMS_DEPEND=" dev-libs/icu dev-libs/libxml2 dev-libs/libxslt - postgres? ( dev-db/postgresql ) + postgres? ( >=dev-db/postgresql-9.1:* ) mysql? ( virtual/mysql )" DEPEND="${GEMS_DEPEND} dev-vcs/git" @@ -210,11 +210,11 @@ pkg_postinst() { elog "haven't done so already." elog if use postgres; then - elog "If you have local PostgreSQL running, just copy&run:" - elog " su postgres" - elog " psql -c \"CREATE ROLE gitlab_ci PASSWORD 'gitlab_ci' \\" - elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" - elog " createdb -E UTF-8 -O gitlab_ci gitlab_ci_production" + elog "If you have local PostgreSQL running, just copy&run:" + elog " su postgres" + elog " psql -c \"CREATE ROLE gitlab_ci PASSWORD 'gitlab_ci' \\" + elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" + elog " createdb -E UTF-8 -O gitlab_ci gitlab_ci_production" elog " Note: You should change your password to something more random..." elog fi @@ -231,11 +231,10 @@ pkg_config() { if [ ! -r "${CONF_DIR}/database.yml" ]; then eerror "Copy ${CONF_DIR}/database.yml.* to" - eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" + eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" eerror "database settings for \"production\" environment."; die fi - local email_from="$(ryaml ${CONF_DIR}/application.yml production gitlab_ci email_from)" local gitlab_ci_home="$(egethome ${MY_USER})" diff --git a/www-apps/gitlab-ci/gitlab-ci-8.0.3.ebuild b/www-apps/gitlab-ci/gitlab-ci-8.0.3.ebuild index f8be13b..0d18f34 100644 --- a/www-apps/gitlab-ci/gitlab-ci-8.0.3.ebuild +++ b/www-apps/gitlab-ci/gitlab-ci-8.0.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI="5" @@ -12,9 +12,9 @@ EAPI="5" # USE_RUBY="ruby21" -PYTHON_DEPEND="2:2.7" +PYTHON_COMPAT=( python2_7 ) -inherit eutils python ruby-ng user +inherit eutils python-r1 ruby-ng user DESCRIPTION="GitLab CI is a continuous integration server that is tightly integrated with GitLab" HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci" @@ -38,7 +38,7 @@ GEMS_DEPEND=" dev-libs/icu dev-libs/libxml2 dev-libs/libxslt - postgres? ( dev-db/postgresql ) + postgres? ( >=dev-db/postgresql-9.1:* ) mysql? ( virtual/mysql )" DEPEND="${GEMS_DEPEND} dev-vcs/git" @@ -210,11 +210,11 @@ pkg_postinst() { elog "haven't done so already." elog if use postgres; then - elog "If you have local PostgreSQL running, just copy&run:" - elog " su postgres" - elog " psql -c \"CREATE ROLE gitlab_ci PASSWORD 'gitlab_ci' \\" - elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" - elog " createdb -E UTF-8 -O gitlab_ci gitlab_ci_production" + elog "If you have local PostgreSQL running, just copy&run:" + elog " su postgres" + elog " psql -c \"CREATE ROLE gitlab_ci PASSWORD 'gitlab_ci' \\" + elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" + elog " createdb -E UTF-8 -O gitlab_ci gitlab_ci_production" elog " Note: You should change your password to something more random..." elog fi @@ -231,11 +231,10 @@ pkg_config() { if [ ! -r "${CONF_DIR}/database.yml" ]; then eerror "Copy ${CONF_DIR}/database.yml.* to" - eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" + eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" eerror "database settings for \"production\" environment."; die fi - local email_from="$(ryaml ${CONF_DIR}/application.yml production gitlab_ci email_from)" local gitlab_ci_home="$(egethome ${MY_USER})" diff --git a/www-apps/gitlab-ci/metadata.xml b/www-apps/gitlab-ci/metadata.xml new file mode 100644 index 0000000..1315b88 --- /dev/null +++ b/www-apps/gitlab-ci/metadata.xml @@ -0,0 +1,8 @@ + + + + + manuel@fritteli.ch + Manuel Friedli + + diff --git a/www-apps/gitlabhq/Manifest b/www-apps/gitlabhq/Manifest index dd0a9d6..82a44c0 100644 --- a/www-apps/gitlabhq/Manifest +++ b/www-apps/gitlabhq/Manifest @@ -11,6 +11,7 @@ AUX gitlabhq-fix-sendmail-config.patch 731 SHA256 51f0d0af2a7c048d7cff56cf279556 DIST gitlabhq-7.14.3.tar.gz 6393535 SHA256 3814a3bdff9610b269be15b8cf35701fcdd78a5a80fb1b366269acc49b23f5e4 SHA512 f2088c151b424cbca0fbc65073c1198ea9c3619570ca3543cf5f0ddd193a6105941608df418eeb506bde83f2c0bbd34cea267caaed70092afcca54219e84004d WHIRLPOOL 70574a135eb426e93086502ad7a0d5b73e1070a19c529852fe2aa60c2081d27bbb4289340b73b469ecfd489779cc409bb56de263e47aaa07859ed0a14dd51f44 DIST gitlabhq-8.0.2.tar.gz 8238940 SHA256 e17a889f33c85b86744ea7be7cabb69feb340b82a4f01706360a985ceb6fd0f3 SHA512 901d0841075514af6e5f1a5a1064f81347769d024b1d0a5527de069ba29de1746ec3c27045529acd7fd993ad53ea65a08d24f3fc3fcbb2fafebc4b7c75490f97 WHIRLPOOL 19e9c1f4ea7e0106dea552bc875e2bfd1f518fe6aeefa6934772ebb29ba388eaad0715e36fa53f22fdc7e90203eea380ae62fc0dc8b7ce999efb2ee05d0cc63b DIST gitlabhq-8.0.3.tar.gz 8238927 SHA256 b299b100f8963f86aaeab01ad4ba49ac034cf77e803cff0fa710065e3464a049 SHA512 e247b3677ca86f43e665623c3a2602ab33843860537813fa64e3cd33b408698f0482e1ce437a4a30976b0656977f86890173ca044b7d07bfdfda3d269d311802 WHIRLPOOL 710f473d8b6c06fff9e72258102653f24035d5533f257d2d6d842ae0598fb048c6e76f9706e3662a93a9d1ec34ef67a67686fdee7439fb776de686eae19120ea -EBUILD gitlabhq-7.14.3.ebuild 11046 SHA256 f9af41cfd01aaa0312323a6da4dea126f1bd0c7e88aee4e143c541829eb6fdbc SHA512 dd5d4a4495f46edf66b33126659dbf4c11da7274a069a02227f1404cbc7e07f2c7bd48dc019b3c3d7239e29000204be3fba57b27d27c7b06d84cbb16ef0e1ad2 WHIRLPOOL 1ce529cf76c7b712789c6c67619afc79e8ad0f99ac9354c3428733578fdc9842c75963a73803530c22634e8c1eb5267b24f7251133c82087d397a77e9eac3edf -EBUILD gitlabhq-8.0.2.ebuild 11066 SHA256 cf03c063dfc12e120a960fb22201c4593341152b2a6df3c97dff29567a250c48 SHA512 c015f35603cf8401db46f638dc583c869a21e9cfe4c076fa1c43871b2fcdf0fb2c3ce08883461d4020062e5ee88ad737d178120c2a3c6cfc5367ad1ffa719818 WHIRLPOOL 6a20a1d9f2389d0b4b0710d536dcd3053a19f8165fbe8215202114d89e026640c021737a06496a13023b21aa741a5164da5cffa6d5df47d767eb4446aaa69365 -EBUILD gitlabhq-8.0.3.ebuild 11073 SHA256 44fc58f69308d0a37402e133e6b1624de3663b07d25f4d6cd516cc8516b13231 SHA512 df16434366f00a49335f04e91686d3bf9e2145dfb907b15b6e751d3f972cbbc3a23ce5b6883a29ebae216195cd2a377a3c8cfd06a4d44394d71ce14b5b73f5d2 WHIRLPOOL 23af35480b251a05892d4f46cfbfb7f9b970149d4a8fb48af7155832626752026373c5b6a8c9a48a8d4696780ef0006c29a993d9662fb8576820f9aeef643b15 +EBUILD gitlabhq-7.14.3.ebuild 11037 SHA256 41ef6da353b308ddf94dea245cee85b8fa0a16d15d20cfd210ec8b908ea1a123 SHA512 c88df7c472fef7fc609bc4c4f622dfb7c9d7288a21859b3794305a100be013153a1058cd111c0e880094626b620cda72cc29632661e0c3c4f2b325beec555e97 WHIRLPOOL 795038d6d9443e242175132638bf32bf3bb191ec876f6abc3874ee68fce15c32b86e6574158ab6561c3693ecfce6457a0da619c9405fc447cbebf1c8732ac0e8 +EBUILD gitlabhq-8.0.2.ebuild 11057 SHA256 8fe84f6f18639635a766b32ca1dcb57ad888244adf327ec49adf365b584ac945 SHA512 345416e5bc433a26ef62ba4493f4973afea1994cc547febdf411be9907fa1ee723f1bdfe1262c5e2ff38c84de56e47153e30e5a92ed69b23646473d1c3645d92 WHIRLPOOL 801b6341fe37f1ab1e140b9b8e30914b81d923cb8464b9c1dd3a6f74544edd09c66bd8986e016484466ef69e8900b2e39db7465fc0bd79a6d7abb50280aab1ee +EBUILD gitlabhq-8.0.3.ebuild 11064 SHA256 16f734a8d84826545fb2dd381699437ab545ac59a05f9008e0e5b84b4534211a SHA512 cc88d4a809f7148a928b94e43ad9f76f41921761b060d22807fb515c4741e5b6804dba97cc6e3d114e6291551b9e5956cdac7c0c6404fa999d86d98b80835eb6 WHIRLPOOL 21287af850d3c7a89cfcfa65dce151caa5cf6e75edf75277a4a2cd86e0f8a7489879ec612aee5de1d05750a29440d1bb12f586c18ae8b69e9814057937dddca6 +MISC metadata.xml 545 SHA256 1b7fc44d811e1ab7638fe4a40253f49d5f1071872d3020c22c4f67662750cb2f SHA512 86f47d297892bccfefa087d93936296f5647993a9ec8e3f47907a6859cbf385e5bc6f00502d7836c9e8d9efef2b6725bf145b0150924c2082b2bd164469ef6ea WHIRLPOOL 6bfb8a55684d68c8bfa6e025a0be965f7b815394ee0896dd2a13cfb524e3cf3f3149acc9072897e30a1842060389576aac07ea8beb4a8b0bfc3e8eab3723f2a1 diff --git a/www-apps/gitlabhq/gitlabhq-7.14.3.ebuild b/www-apps/gitlabhq/gitlabhq-7.14.3.ebuild index 82f6c70..e946e95 100644 --- a/www-apps/gitlabhq/gitlabhq-7.14.3.ebuild +++ b/www-apps/gitlabhq/gitlabhq-7.14.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI="5" @@ -12,9 +12,9 @@ EAPI="5" # USE_RUBY="ruby21" -PYTHON_DEPEND="2:2.7" +PYTHON_COMPAT=( python2_7 ) -inherit eutils python ruby-ng user systemd +inherit eutils python-r1 ruby-ng user systemd DESCRIPTION="GitLab is a free project and repository management application" HOMEPAGE="https://github.com/gitlabhq/gitlabhq" @@ -43,12 +43,13 @@ GEMS_DEPEND=" dev-libs/icu dev-libs/libxml2 dev-libs/libxslt - dev-util/cmake dev-util/ragel net-libs/nodejs - postgres? ( dev-db/postgresql ) + postgres? ( >=dev-db/postgresql-9.1:* ) mysql? ( virtual/mysql ) - kerberos? ( virtual/krb5 ) + kerberos? ( virtual/krb5 )" +CDEPEND=" + dev-util/cmake virtual/pkgconfig" DEPEND="${GEMS_DEPEND} >=dev-vcs/gitlab-shell-2.6.5 @@ -235,11 +236,11 @@ pkg_postinst() { elog "haven't done so already." elog if use postgres; then - elog "If you have local PostgreSQL running, just copy&run:" - elog " su postgres" - elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\" - elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" - elog " createdb -E UTF-8 -O gitlab gitlabhq_production" + elog "If you have local PostgreSQL running, just copy&run:" + elog " su postgres" + elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\" + elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" + elog " createdb -E UTF-8 -O gitlab gitlabhq_production" elog " Note: You should change your password to something more random..." elog fi @@ -263,7 +264,7 @@ pkg_config() { if [ ! -r "${CONF_DIR}/database.yml" ]; then eerror "Copy ${CONF_DIR}/database.yml.* to" - eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" + eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" eerror "database settings for \"production\" environment."; die fi diff --git a/www-apps/gitlabhq/gitlabhq-8.0.2.ebuild b/www-apps/gitlabhq/gitlabhq-8.0.2.ebuild index a32d915..98df9fc 100644 --- a/www-apps/gitlabhq/gitlabhq-8.0.2.ebuild +++ b/www-apps/gitlabhq/gitlabhq-8.0.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI="5" @@ -12,9 +12,9 @@ EAPI="5" # USE_RUBY="ruby21" -PYTHON_DEPEND="2:2.7" +PYTHON_COMPAT=( python2_7 ) -inherit eutils python ruby-ng user systemd +inherit eutils python-r1 ruby-ng user systemd DESCRIPTION="GitLab is a free project and repository management application" HOMEPAGE="https://github.com/gitlabhq/gitlabhq" @@ -43,12 +43,13 @@ GEMS_DEPEND=" dev-libs/icu dev-libs/libxml2 dev-libs/libxslt - dev-util/cmake dev-util/ragel net-libs/nodejs - postgres? ( dev-db/postgresql ) + postgres? ( >=dev-db/postgresql-9.1:* ) mysql? ( virtual/mysql ) - kerberos? ( virtual/krb5 ) + kerberos? ( virtual/krb5 )" +CDEPEND=" + dev-util/cmake virtual/pkgconfig" DEPEND="${GEMS_DEPEND} >=dev-vcs/gitlab-shell-2.6.5 @@ -236,11 +237,11 @@ pkg_postinst() { elog "haven't done so already." elog if use postgres; then - elog "If you have local PostgreSQL running, just copy&run:" - elog " su postgres" - elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\" - elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" - elog " createdb -E UTF-8 -O gitlab gitlabhq_production" + elog "If you have local PostgreSQL running, just copy&run:" + elog " su postgres" + elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\" + elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" + elog " createdb -E UTF-8 -O gitlab gitlabhq_production" elog " Note: You should change your password to something more random..." elog fi @@ -264,7 +265,7 @@ pkg_config() { if [ ! -r "${CONF_DIR}/database.yml" ]; then eerror "Copy ${CONF_DIR}/database.yml.* to" - eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" + eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" eerror "database settings for \"production\" environment."; die fi diff --git a/www-apps/gitlabhq/gitlabhq-8.0.3.ebuild b/www-apps/gitlabhq/gitlabhq-8.0.3.ebuild index 2ffb2ca..e2d37c8 100644 --- a/www-apps/gitlabhq/gitlabhq-8.0.3.ebuild +++ b/www-apps/gitlabhq/gitlabhq-8.0.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ EAPI="5" @@ -12,9 +12,9 @@ EAPI="5" # USE_RUBY="ruby21" -PYTHON_DEPEND="2:2.7" +PYTHON_COMPAT=( python2_7 ) -inherit eutils python ruby-ng user systemd +inherit eutils python-r1 ruby-ng user systemd DESCRIPTION="GitLab is a free project and repository management application" HOMEPAGE="https://github.com/gitlabhq/gitlabhq" @@ -43,12 +43,13 @@ GEMS_DEPEND=" dev-libs/icu dev-libs/libxml2 dev-libs/libxslt - dev-util/cmake dev-util/ragel net-libs/nodejs - postgres? ( dev-db/postgresql ) + postgres? ( >=dev-db/postgresql-9.1:* ) mysql? ( virtual/mysql ) - kerberos? ( virtual/krb5 ) + kerberos? ( virtual/krb5 )" +CDEPEND=" + dev-util/cmake virtual/pkgconfig" DEPEND="${GEMS_DEPEND} >=dev-vcs/gitlab-shell-2.6.5 @@ -236,11 +237,11 @@ pkg_postinst() { elog "haven't done so already." elog if use postgres; then - elog "If you have local PostgreSQL running, just copy&run:" - elog " su postgres" - elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\" - elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" - elog " createdb -E UTF-8 -O gitlab gitlabhq_production" + elog "If you have local PostgreSQL running, just copy&run:" + elog " su postgres" + elog " psql -c \"CREATE ROLE gitlab PASSWORD 'gitlab' \\" + elog " NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" + elog " createdb -E UTF-8 -O gitlab gitlabhq_production" elog " Note: You should change your password to something more random..." elog fi @@ -264,7 +265,7 @@ pkg_config() { if [ ! -r "${CONF_DIR}/database.yml" ]; then eerror "Copy ${CONF_DIR}/database.yml.* to" - eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" + eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" eerror "database settings for \"production\" environment."; die fi diff --git a/www-apps/gitlabhq/metadata.xml b/www-apps/gitlabhq/metadata.xml new file mode 100644 index 0000000..f9b4a1d --- /dev/null +++ b/www-apps/gitlabhq/metadata.xml @@ -0,0 +1,12 @@ + + + + + manuel@fritteli.ch + Manuel Friedli + + + Use the Unicorn web server. Never tested the package without it, so disable at your own risk. + Use dev-libs/libgit2 from the system instead of the bundled libgit. The bundled library sometimes causes build breakages. + + diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest deleted file mode 100644 index ecf0557..0000000 --- a/x11-libs/gtk+/Manifest +++ /dev/null @@ -1,17 +0,0 @@ -AUX gtk+-1.2-locale_fix.patch 419 SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb SHA512 7350d2b60e4d66219ec57ce56f9e2cd3c9c2b5c399d8e35c49243a0383b3455ba4225257bcd1303ad5b4ef98ea6b6ff401afde43b1b3841eeac2527443f7cd33 WHIRLPOOL d9be6ee6014f4a62b6ef962be5fa610084148e479d916838390dce8f2acff525b1ecb6d596d9af4058177eb21753fa7bcadd7fdebc95fe905cd3cf3829d7db1a -AUX gtk+-1.2.10-as-needed.patch 19865 SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7 SHA512 e69ab1a967218889dda64e8a87a390140ab70585b0ad031c3d6cbd5431857c0bf9c76300bb0f9ca8dfd703c0297c618d806795df1f18a5ab23fe3f06fb11c5a2 WHIRLPOOL 9281fcda1a9ab7e1542eb466573887ca258aec440d83d64901f9122ab41ab0c91e5bcbedce8abb2c9952f6be2e5459e4a84bf3f0374f5305579c5bbd20dfc0e9 -AUX gtk+-1.2.10-automake-1.13.patch 450 SHA256 c577ee80d654a254309d198e75cc3212fb7dfc9750627737b73b00a39b21d936 SHA512 2d21c44242f8cc10f15f905b5531ee6bb17795d2e645ff04c6806641e8f323a0fbe5371e2c60200b15bf38c36336447b43d040ca838b555ecdbc3644a089b5ff WHIRLPOOL 931636f180c6bbccffc1619de92be5c48dbcd9f993a5292a07c2c251bca3f80332501e785363a2de24b22cf110d1853512862f265ad6fb63ef284da6b38f07a3 -AUX gtk+-1.2.10-automake.patch 3270 SHA256 f36beb9303dcf08b87ffc404576c001003c1068ae0ad66fe1585a7c1f0c462d2 SHA512 8e603e8c313a87646b3d0b81cd59dfcfcc1f318c7bac58c6fcfde12b1cbbd235b0e6a14ce76643d1a6fccd8507f37e345ff21a2e9273a3a7922e21e1a8515bf7 WHIRLPOOL ce47fe13bad5ef4d659ee83755d703e229f25b3fcd85c38dbbfe6e3381a8400598437a727bb5fb6753462ba54a29ccf1ec51be2f90c63e6f0cbaf47df78b3136 -AUX gtk+-1.2.10-cleanup.patch 246 SHA256 6db4c8163e3e9032b5195acf230773d9bfd0c383157d65f2d42e4300e2b6a35f SHA512 3111fcad1e3849c9d15613a8dc7fd7ff6d9261d58d3b4d2502ba07eb3c0ded8eadf7e0023f24b3490c56087e93bb00499a82e31314201cdcf8897949b8258466 WHIRLPOOL a1498be29af2186881daec1c9e46f600d4ead23dc48fd99d08241d13697999eead1afa2965249b66c94746163d1a42ae0e24c26b9f954ec85cd1d14142f7c7f0 -AUX gtk+-1.2.10-m4.patch 220 SHA256 88f45c2f0413f29d62ca138c87b41d24a73b47456f5b469277843de827717324 SHA512 4900aad1e8b84f3fa9bc497455fe28d521950708e33274da5776f18444f19bdb383d65406142550f2fc6fb7bffe5ac5fd7b1c40ac2d008ab166a1a0c6a8b1d8b WHIRLPOOL d68204ec81a08541b8fd4076f8082882371a21563fed02519563edcbb1d4390600ab86d492703f43115c2a6c7b59ce4a140abd13de18db04a1e775bfa31f0653 -AUX gtk+-2.24.20-darwin-quartz-pasteboard.patch 435 SHA256 3eaf1b2f534309344f046c1155b29d821c96287360705f13d88e182e720777b1 SHA512 123526aadb43c98490f361b964d709d78b9e10beebb845b71474a4db8eb7bfe1b102a9736b50f4c6e20bb4fa7ad8dafa52e4237f30dcae9094d2575446148126 WHIRLPOOL cf9bde6aac5e34dae5e5788d0a098e2c1230c585cb614a71d784ca587c6f0bc5f874d42d684af2e9d2314df8a2aee23e2a66d8fb36f625f04925374a7ba5bd64 -AUX gtk+-2.24.24-out-of-source.patch 1487 SHA256 3492f3c22df40f7e0696098eb689b949ce0b6152293aba0a54adb8a859ec5250 SHA512 794903f8254a49f7d0e24f9730658dc69184969bb450419bd34bc2a9e7065d99931df4ae5ecd93abc0a18bff546aeb6816aae47531e8a79dc5aef5beaf9b6aa2 WHIRLPOOL abc0a7572bd27afc3d4b0d0dbae78e93ebfec8c8bbc6787c632de80401d4f0b9f6621ccb0fbae867a70cea8767f97542b7c42c9f532598676d89563677cd79d3 -AUX gtk+-3.12.2-builtin-icon.patch 916 SHA256 ab655e9de25bc30698312108a87f15ce208004b38800ae802e62133007197758 SHA512 a12d25e92854c0e73ada4edf4ef26ccde18c052c229c2de1ab03feb26759452de804d44c51954584e68aa42ae0fae3c254aae19fd50bf999e6eda2c0c619f467 WHIRLPOOL 2077652a65be2073193cbb6f3fdcf5de7f5c1474cd98bf464b5a6adcca560fb5fc4f86f0ba50fd6da387fdd18c5fde53b4a1395ce3b9ec34f981b376e5f149da -AUX gtk+-3.12.2-darwin10.6.patch 1269 SHA256 ecda99fd1a105c09843183b1a2709c605d7c5129f2985fd8a29d32b967eb8537 SHA512 2dafca048fba34f1b06430cc70e90b148dfc325e67dbe90195440609adb60fa4bdea9cb7dd0d16cf039452151271bf137e9c3ea8277a8795e3d0cd719bbc05aa WHIRLPOOL c464c8b573e256b44552150b8bc7be43e2c7112d5a0032be452323bd914830b7b35f04f6240c2ba8d696161753df19ffd7a6ac20626299392877e4e06bc10d5e -AUX gtk+-3.14.9-treeview-change-keyboard-bindings-behaviour.patch 6076 SHA256 fd327426d3eb789d724c170c5eea96009b6a60433f6a5af673e0c75c05f15e72 SHA512 0a667456d828325894ec58a51388f2556fcc663cd70957fae4f2ad06e883328f7ea03bcee4702d18ad094628c80603127eaf85d83076cec97b09ff1b43ea9bca WHIRLPOOL 25d6a5975f7d8a98cd6490a15e38564f0172f934ea92e41fb30d72dbea430d2976a4f0b10404836564fc1f1963fac37e2d4e9a916bf1703e912ecbf27a04b8a2 -AUX gtk+-3.14.9-treeview-change-keyboard-bindings-behaviour.patch_original 6885 SHA256 c67c9dffd0c74a376ac35c971fb435852667dfaee865c384953f28128d64ac0a SHA512 9b43b0506736bbdf10d98593c9f06dccec76e9022eb094d4ae21671f3559be0dd79b9ed6e024ee65c7cd0b1e52c91038095e46806c92c68b57535de53b03ee20 WHIRLPOOL 8c5478b3f12561839eeb7aa740df67bb3cc8d4fe2199f34d7e7e99ae0fccfbfd7b34d90e9c99d7497468c37aaed125bc06c535e5ff0440939926878f9046f284 -AUX gtk+-non-bash-support.patch 1566 SHA256 2cb0e845deb9092a1bfbe6aca1891c744623d699a7353236637005a666770c2d SHA512 e2331b9d2ebe5a96e19bb01a1191887ff947e73dac91822e5ccdb1a7078adb8f706dc13b188ca884a2651228542ee38959a0afce5a5c5b27060374f7f5462ec5 WHIRLPOOL 39a2276e1aa1fbd2171869ca9a5c9365ea72db57192403871cd2e7317cc1d02611b44b5d254634712598758c77681056f61b75c116047a08c1bb2743f0e2c3ab -AUX gtkrc 627 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4 WHIRLPOOL fdb1c72ce448e867dd8d591455103fb7790919e1d7e77d6c5aa46e9a3fbc590ad6a189c50d2bc958896471a31b975940960307dc80a2d88416b77fca581b4dfb -AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163 SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418 WHIRLPOOL 64a2c11ef1a6eda0bca40555a182023229202bcf15d527e6da8c52703be2fca26629b78ed677522eb626de7b7f456a7c37ab7fc3fe41907f1a46d770edb1fd67 -DIST gtk+-3.14.9.tar.xz 15716588 SHA256 3be9560e6e99388d7706a168e3353ecd63fc30ec4f7f8bea23889e71ab7b6c64 SHA512 3b64142d65ec4b4e0ed709c2fac629d80b95dac03481a3d6f8e3cc6c351ac779fe172a1edee552df7b3c40287f10c97fa0e99212e5f0e6b4751e3d8efd0896e5 WHIRLPOOL bc45b3722913ebb90bff944ec724909d01e3e976d49f8bd273500de2af9de7dcedc85e24fca36226816993a10cb87f4477f4498cc67946449855b37a0790a2fa -EBUILD gtk+-3.14.9.ebuild 7334 SHA256 54fb7382f1a57b8d341b3b325667748aabdd0671f64406e5406e1e7cd475f60d SHA512 a0697becdf9940387e3dc1d47a7033b6d41b0b2cbcdba711d16e7a6f743b9ec0a12b2a3a1caffe239783e87b1725873cc02ef02c0abfcfc1f5591bc66ec4ccf9 WHIRLPOOL 107f417a674ee985505d72474d640dd02532f261aab6d9a62f7575068ffe3311d662044429fdb5493ab025af852097708ee1013f6f6acdfcd1b196aeb3482141 diff --git a/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch b/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch deleted file mode 100644 index a3fd198..0000000 --- a/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- gtk/gtkrc.c.~1.40.2.17.~ 2001-07-10 20:06:35.000000000 +0200 -+++ gtk/gtkrc.c 2003-03-05 16:56:10.000000000 +0100 -@@ -453,7 +453,7 @@ - - if (!initted) - { -- char *locale = setlocale (LC_CTYPE, NULL); -+ char *locale = g_strdup (setlocale (LC_CTYPE, NULL)); - char *p; - - initted = TRUE; -@@ -558,6 +558,7 @@ - - if (tmp) g_free (tmp); - } -+ g_free (locale); - } - - i = 0; diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch b/x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch deleted file mode 100644 index aa295f2..0000000 --- a/x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch +++ /dev/null @@ -1,696 +0,0 @@ ---- gtk+-1.2.10/acinclude.m4.orig 2006-05-24 23:23:51.000000000 -0700 -+++ gtk+-1.2.10/acinclude.m4 2006-05-24 23:23:19.000000000 -0700 -@@ -672,7 +672,7 @@ - AC_DEFINE(HAVE_STPCPY) - fi - -- AM_LC_MESSAGES -+ gt_LC_MESSAGES - AM_GTK_WITH_NLS - - if test "x$CATOBJEXT" != "x"; then ---- gtk+-1.2.10/gtk.m4.orig 2006-05-24 23:32:00.000000000 -0700 -+++ gtk+-1.2.10/gtk.m4 2006-05-24 23:36:16.000000000 -0700 -@@ -1,6 +1,11 @@ - # Configure paths for GTK+ - # Owen Taylor 97-11-3 -- -+AC_DEFUN([GTK_AC_DIVERT_BEFORE_HELP], -+[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])], -+ [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])], -+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl -+$1 -+AC_DIVERT_POP()])])]) - dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) - dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS - dnl ---- gtk+-1.2.10/configure.in.orig 2006-05-25 05:45:06.000000000 -0700 -+++ gtk+-1.2.10/configure.in 2006-05-25 05:44:08.000000000 -0700 -@@ -1,6 +1,8 @@ -+builtin(include,gtk.m4) -+ -+ - # Process this file with autoconf to produce a configure script. - AC_INIT(gdk/gdktypes.h) -- - # In the following, there are a the following variants - # of GLib cflags and libs variables - # -@@ -12,12 +14,11 @@ - # glib_thread_cflags: cflags to store in gtk-config for gtk-config gthread - # glib_thread_libs: libs to store in gtk-config for gtk-config gthread - -+AC_CANONICAL_TARGET - # Save this value here, since automake will set cflags later - cflags_set=${CFLAGS+set} - --dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they --dnl are available for $ac_help expansion (don't we all *love* autoconf?) --AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl -+GTK_AC_DIVERT_BEFORE_HELP([ - # - # Making releases: - # GTK_MICRO_VERSION += 1; -@@ -32,9 +33,8 @@ - GTK_MICRO_VERSION=10 - GTK_INTERFACE_AGE=1 - GTK_BINARY_AGE=10 --GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION --dnl --AC_DIVERT_POP()dnl -+GTK_VERSION="$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION" -+]) - - AC_SUBST(GTK_MAJOR_VERSION) - AC_SUBST(GTK_MINOR_VERSION) -@@ -44,9 +44,9 @@ - AC_SUBST(GTK_VERSION) - - # libtool versioning --LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION -+LT_RELEASE="$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION" - LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE` --LT_REVISION=$GTK_INTERFACE_AGE -+LT_REVISION="$GTK_INTERFACE_AGE" - LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE` - AC_SUBST(LT_RELEASE) - AC_SUBST(LT_CURRENT) -@@ -54,11 +54,8 @@ - AC_SUBST(LT_AGE) - - # For automake. --VERSION=$GTK_VERSION --PACKAGE=gtk+ -- --# Save this value here, since automake will set cflags later --cflags_set=${CFLAGS+set} -+VERSION="$GTK_VERSION" -+PACKAGE="gtk+" - - dnl Initialize automake stuff - AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) -@@ -67,42 +64,40 @@ - AM_CONFIG_HEADER(config.h) - - dnl Initialize libtool --AM_PROG_LIBTOOL -+AC_PROG_LIBTOOL - - dnl Initialize maintainer mode - AM_MAINTAINER_MODE - --AC_CANONICAL_HOST -- - dnl figure debugging default, prior to $ac_help setup --dnl --AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl -+ -+GTK_AC_DIVERT_BEFORE_HELP([ - if test `expr $GTK_MINOR_VERSION \% 2` = 1 ; then -- debug_default=yes -+ debug_default="yes" - else -- debug_default=minimum -+ debug_default="minimum" - fi --AC_DIVERT_POP()dnl -- -+]) - dnl declare --enable-* args and collect ac_help strings --AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default) -+AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],, -+ [enable_debug="$debug_default"]) - AC_ARG_ENABLE(shm, [ --enable-shm support shared memory if available [default=yes]], -- echo $enable_shm, enable_shm="yes") --AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]], -- , enable_ansi=no) -+ [echo "$enable_shm"],[enable_shm="yes"]) -+AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]],,[enable_ansi="no"]) - AC_ARG_WITH(glib, [ --with-glib=DIR Use uninstalled copy of glib]) --AC_ARG_ENABLE(xim, [ --enable-xim support XIM [default=yes]], -- , enable_xim="yes") --AC_ARG_ENABLE(xim_inst, [ --disable-xim-inst does not use xim instantiate callback], -- , enable_xim_inst="maybe") --AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes) -+AC_ARG_ENABLE(xim, [ --enable-xim support XIM [default=yes]],,[enable_xim="yes"]) -+AC_ARG_ENABLE(xim_inst, [ --disable-xim-inst does not use xim instantiate callback],, -+ [enable_xim_inst="maybe"]) -+AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],, -+ [enable_rebuilds="yes"]) - AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ]) -- - AC_ARG_WITH(xinput, [ --with-xinput=[no/gxi/xfree] support XInput ]) --AC_ARG_WITH(native_locale, [ --with-native-locale=[yes/no] Use native locale support [default=no]],,with_native_locale=no) -+AC_ARG_WITH(native_locale, [ --with-native-locale=[yes/no] Use native locale support [default=no]],, -+ [with_native_locale="no"]) -+ - - if test "x$enable_debug" = "xyes"; then -- test "$cflags_set" = set || CFLAGS="$CFLAGS -g" -+ test "$cflags_set" = "set" || CFLAGS="$CFLAGS -g" - GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG" - else - if test "x$enable_debug" = "xno"; then -@@ -113,16 +108,14 @@ - fi - - AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}") -- - # Build time sanity check... - AM_SANITY_CHECK - - # Checks for programs. - AC_PROG_CC - AC_ISC_POSIX --AM_PROG_CC_STDC -+AC_PROG_CC_STDC - AC_PROG_INSTALL --AC_PROG_MAKE_SET - - changequote(,)dnl - if test "x$GCC" = "xyes"; then -@@ -144,7 +137,6 @@ - fi - fi - changequote([,])dnl -- - # Honor aclocal flags - ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - -@@ -158,8 +150,7 @@ - AC_CHECK_PROG(INDENT, indent, indent) - - REBUILD=\# --if test "x$enable_rebuilds" = "xyes" && \ -- test -n "$PERL" && \ -+if test "x$enable_rebuilds" = "xyes" && test -n "$PERL" && \ - $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \ - test -n "$AWK" ; then - REBUILD= -@@ -194,55 +185,58 @@ - - dnl Check for nl_langinfo and CODESET - AC_MSG_CHECKING([for nl_langinfo (CODESET)]) --AC_TRY_COMPILE([#include ], -+AC_TRY_COMPILE([#include -+ ], - [char *codeset = nl_langinfo (CODESET);], - AC_DEFINE(HAVE_CODESET,1,[Have nl_langinfo (CODESET)]) -- have_codeset=yes, -- have_codeset=no) -+ have_codeset="yes", -+ have_codeset="no" -+) - AC_MSG_RESULT($have_codeset) - - dnl The DU4 header files don't provide library prototypes unless - dnl -std1 is given to the native cc. - AC_MSG_CHECKING([for extra flags to get ANSI library prototypes]) - --gtk_save_LIBS=$LIBS -+gtk_save_LIBS="$LIBS" - LIBS="$LIBS -lm" - AC_TRY_RUN([#include - int main (void) { return (log(1) != log(1.)); }], - AC_MSG_RESULT(none needed), -- gtk_save_CFLAGS=$CFLAGS -+ [gtk_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -std1" - AC_TRY_RUN([#include - int main (void) { return (log(1) != log(1.)); }], - AC_MSG_RESULT(-std1), - AC_MSG_RESULT() -- CFLAGS=$gtk_save_CFLAGS -- AC_MSG_WARN( -- [No ANSI prototypes found in library. (-std1 didn't work.)]), -- true -- ), -+ CFLAGS="$gtk_save_CFLAGS" -+ AC_MSG_WARN([No ANSI prototypes found in library. (-std1 didn't work.)]), -+ true)], - AC_MSG_RESULT(none needed) - ) --LIBS=$gtk_save_LIBS -+LIBS="$gtk_save_LIBS" - - dnl NeXTStep cc seems to need this - AC_MSG_CHECKING([for extra flags for POSIX compliance]) --AC_TRY_COMPILE([#include ], [DIR *dir;], -+AC_TRY_COMPILE([#include -+ ],[DIR *dir;], - AC_MSG_RESULT(none needed), -- gtk_save_CFLAGS=$CFLAGS -+ [gtk_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -posix" -- AC_TRY_COMPILE([#include ], [DIR *dir;], -+ AC_TRY_COMPILE([#include -+ ],[DIR *dir;], - AC_MSG_RESULT(-posix), - AC_MSG_RESULT() -- CFLAGS=$gtk_save_CFLAGS -- AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)]))) -+ CFLAGS="$gtk_save_CFLAGS" -+ AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])])) - --if test x$with_glib = xyes ; then -- AC_MSG_ERROR([ --*** Directory must be specified for --with-glib]) -+ -+ -+if test "x$with_glib" = "xyes" ; then -+ AC_MSG_ERROR([*** Directory must be specified for --with-glib]) - fi - --if test x$with_glib = x ; then -+if test "x$with_glib" = "x" ; then - # Look for separately installed glib - - AM_PATH_GLIB(1.2.8,, -@@ -261,7 +255,7 @@ - else - # Use uninstalled glib (assume they got the version right) - -- GLIB_CONFIG=$with_glib/glib-config -+ GLIB_CONFIG="$with_glib/glib-config" - if test -x $GLIB_CONFIG ; then - : - else -@@ -277,9 +271,9 @@ - glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'` - - # canonicalize relative paths -- case $with_glib in -+ case "$with_glib" in - /*) -- glib_dir=$with_glib -+ glib_dir="$with_glib" - ;; - *) - glib_dir="\$(top_builddir)/$with_glib" -@@ -312,61 +306,56 @@ - saved_ldflags="$LDFLAGS" - - CFLAGS="$CFLAGS $X_CFLAGS" --LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS" -+LDFLAGS="$LDFLAGS $X_LDFLAGS" - - if test "x$no_x" = "xyes"; then - AC_MSG_ERROR([ - *** X libraries or include files not found. Check 'config.log' for - *** more details.]) - fi -- - # Checks for libraries. - # Check for the X11 library --AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", -+AC_CHECK_LIB(X11,XOpenDisplay, -+ x_libs="-lX11 $X_EXTRA_LIBS", - AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]), -- $X_EXTRA_LIBS) -- -+ $X_EXTRA_LIBS -+) - if test "x$enable_shm" = "xyes"; then - # Check for the Xext library (needed for XShm extention) - AC_CHECK_LIB(Xext, XShmAttach, - x_libs="-lXext $x_libs", - # On AIX, it is in XextSam instead, but we still need -lXext -- AC_CHECK_LIB(XextSam, XShmAttach, -+ [AC_CHECK_LIB(XextSam, XShmAttach, - x_libs="-lXextSam -lXext $x_libs", -- no_xext_lib=yes, $x_libs), -- $x_libs) -+ no_xext_lib="yes", -+ $x_libs -+ )], -+ $x_libs -+ ) - fi -- - # Check for shaped window extension -- - AC_CHECK_LIB(Xext, XShapeCombineMask, -- if test -z "`echo $x_libs | grep "\-lXext" 2> /dev/null`"; then -+ if test -z "`echo $x_libs | grep \-lXext 2> /dev/null`"; then - x_libs="-lXext $x_libs" - fi -- AC_DEFINE(HAVE_SHAPE_EXT), -- , -- $x_libs) -- -+ AC_DEFINE(HAVE_SHAPE_EXT),, -+ $x_libs -+) - # Check for XConvertCase (X11R6 specific) -- - AC_CHECK_LIB(X11, XConvertCase, -- AC_DEFINE(HAVE_XCONVERTCASE), -- , -- $x_libs) -- -+ AC_DEFINE(HAVE_XCONVERTCASE),, -+ $x_libs -+) - # Check for XIM support. -- --AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback, -- : , -+AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,, - enable_xim_inst="no", -- $x_libs) -- -+ $x_libs -+) - # On Solaris, calling XRegisterIMInstantiateCallback seems to - # cause an immediate segfault, so we disable it, unless - # the user specifically forces it to be on. -- --if test x$enable_xim_inst = xmaybe ; then -- case host in -+if test "x$enable_xim_inst" = "xmaybe" ; then -+ case "$host" in - *-*-solaris*) - enable_xim_inst="no" - ;; -@@ -384,16 +373,15 @@ - fi - - x_cflags="$X_CFLAGS" --x_ldflags="$X_LDFLAGS $X_LIBS" -+x_ldflags="$X_LDFLAGS" - - # set up things for XInput -- - if test "x$with_xinput" = "xgxi"; then - AC_MSG_WARN([ - *** The generic XInput support has not been tested for several years - *** and is not known to work with any currently available X servers]) - AC_DEFINE(XINPUT_GXI) -- xinput_progs=gxid -+ xinput_progs="gxid" - x_libs="-lXi $x_libs" - elif test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then - AC_DEFINE(XINPUT_XFREE) -@@ -413,77 +401,72 @@ - - if test "x$enable_shm" = "xyes"; then - # Check for shared memory -- AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc=yes) -- AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm=yes) -+ AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc="yes") -+ AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm="yes") - - # Check for the X shared memory extension header file - AC_MSG_CHECKING(X11/extensions/XShm.h) - if test "x$no_xext_lib" = "xyes"; then - AC_MSG_RESULT(no) -- no_xshm=yes -+ no_xshm="yes" - else - if test -f "$x_includes/X11/extensions/XShm.h"; then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_XSHM_H) - else - AC_MSG_RESULT(no) -- no_xshm=yes -+ no_xshm="yes" - fi - fi - fi -- - # Check if X_LOCALE definition is necessary -- - AC_MSG_CHECKING(need -DX_LOCALE) - - AC_TRY_RUN([ - #include - #include -- --int --main () -+ int main () - { - return setlocale (LC_ALL, "${with_locale}") == NULL; - }], --need_x_locale=no, --need_x_locale=yes, --need_x_locale=no) -+ need_x_locale="no", -+ need_x_locale="yes", -+ need_x_locale="no" -+) - AC_MSG_RESULT($need_x_locale) - --use_native_locale=no --if test $need_x_locale = yes; then -+use_native_locale="no" -+if test "$need_x_locale" = "yes"; then - GTK_LOCALE_FLAGS="-DX_LOCALE" - else -- if test x$with_native_locale = xyes ; then -+ if test "x$with_native_locale" = "xyes" ; then - AC_MSG_CHECKING(functioning locale support) - -- AC_TRY_COMPILE([#include ],[ -- char c; -+ AC_TRY_COMPILE([#include ], -+ [char c; - if (MB_CUR_MAX == 1) { - wctomb(&c, 42); -- } -- ],use_native_locale=yes,) -- -+ }], -+ use_native_locale="yes" -+ ) - AC_MSG_RESULT($use_native_locale) - fi - fi - --if test x$use_native_locale = xyes ; then -+if test "x$use_native_locale" = "xyes" ; then - AC_MSG_CHECKING(if sizeof(wchar_t) == 4) - -- AC_TRY_RUN([ -- #include -- -- int -- main () -+ AC_TRY_RUN([#include -+ int main () - { - return (sizeof(wchar_t) == 4) ? 0 : 1; -- }], -- ,use_native_locale=no,:) -+ }],, -+ use_native_locale="no" -+ ) - AC_MSG_RESULT($use_native_locale) - fi - --if test $use_native_locale = yes ; then -+if test "$use_native_locale" = "yes" ; then - AC_DEFINE(USE_NATIVE_LOCALE) - fi - -@@ -502,13 +485,17 @@ - - # Check if needs to be included for fd_set - AC_MSG_CHECKING([for fd_set]) --AC_TRY_COMPILE([#include ], -- [fd_set readMask, writeMask;], gtk_ok=yes, gtk_ok=no) --if test $gtk_ok = yes; then -+AC_TRY_COMPILE([#include -+ ], -+ [fd_set readMask, writeMask;], -+ gtk_ok="yes", -+ gtk_ok="no" -+) -+if test "$gtk_ok" = "yes"; then - AC_MSG_RESULT([yes, found in sys/types.h]) - else -- AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes) -- if test $gtk_ok = yes; then -+ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok="yes") -+ if test "$gtk_ok" = "yes"; then - AC_DEFINE(HAVE_SYS_SELECT_H) - AC_MSG_RESULT([yes, found in sys/select.h]) - else -@@ -520,30 +507,35 @@ - # Duplicate `widechar' tests from `glib'. - # Check for wchar.h - AC_MSG_CHECKING(for wchar.h) --AC_TRY_CPP([#include ], gtk_ok=yes, gtk_ok=no) --if test $gtk_ok = yes; then -+AC_TRY_CPP([#include -+ ], -+ gtk_ok="yes", -+ gtk_ok="no" -+) -+if test "$gtk_ok" = "yes"; then - AC_DEFINE(HAVE_WCHAR_H,1,[Define if wchar.h exists]) - fi - AC_MSG_RESULT($gtk_ok) - - # Check for wctype.h (for iswalnum) - AC_MSG_CHECKING(for wctype.h) --AC_TRY_CPP([#include ], gtk_ok=yes, gtk_ok=no) --if test $gtk_ok = yes; then -+AC_TRY_CPP([#include ], gtk_ok="yes", gtk_ok="no") -+if test "$gtk_ok" = "yes"; then - AC_DEFINE(HAVE_WCTYPE_H,1,[Define if wctype.h exists]) - fi - AC_MSG_RESULT($gtk_ok) - - # in Solaris 2.5, `iswalnum' is in -lw - GDK_WLIBS= --AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS=-lw)]) -+AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS="-lw")]) - - # The following is necessary for Linux libc-5.4.38 - oLIBS="$LIBS" - LIBS="$LIBS $GDK_WLIBS" - AC_MSG_CHECKING(if iswalnum() and friends are properly defined) --AC_TRY_LINK([#include ],[ --#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) -+AC_TRY_LINK([#include -+ ], -+ [#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) - # ifdef HAVE_WCTYPE_H - # include - # else -@@ -554,11 +546,13 @@ - #else - # define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c)) - #endif --iswalnum((wchar_t) 0); --], gtk_ok=yes, gtk_ok=no) -+ iswalnum((wchar_t) 0);], -+ gtk_ok="yes", -+ gtk_ok="no" -+) - LIBS="$oLIBS" - --if test $gtk_ok = no; then -+if test "$gtk_ok" = "no"; then - AC_DEFINE(HAVE_BROKEN_WCTYPE,1,[Define if the wctype function is broken]) - GDK_WLIBS= - fi -@@ -580,5 +574,5 @@ - gtk/Makefile - gtk/gtkfeatures.h - gdk.pc --gtk+.pc --], [chmod +x gtk-config]) -+gtk+.pc], -+[chmod +x gtk-config]) ---- gtk+-1.2.10/gdk/Makefile.am.orig 2006-05-19 02:41:18.000000000 -0700 -+++ gtk+-1.2.10/gdk/Makefile.am 2006-05-19 02:11:54.000000000 -0700 -@@ -21,12 +21,11 @@ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) \ - -export-dynamic \ -- @GLIB_DEPLIBS@ \ - @x_ldflags@ \ -- @x_libs@ \ -- -lm \ - @STRIP_END@ - -+libgdk_la_LIBADD = @GLIB_DEPLIBS@ @x_libs@ -lm -+ - # - # setup source file variables - # -@@ -104,14 +103,13 @@ - EXTRA_PROGRAMS = gxid - bin_PROGRAMS = @xinput_progs@ - LDADDS = @STRIP_BEGIN@ \ -- @x_ldflags@ \ - @x_libs@ \ - @GLIB_LIBS@ \ - -lm \ - @STRIP_END@ - gxid_SOURCES = gxid.c - gxid_LDADD = $(LDADDS) -- -+gxid_LDFLAGS = @x_ldflags@ - - .PHONY: files - ---- gtk+-1.2.10/gtk/Makefile.am.orig 2006-05-25 07:40:45.000000000 -0700 -+++ gtk+-1.2.10/gtk/Makefile.am 2006-05-25 07:43:20.000000000 -0700 -@@ -27,13 +27,15 @@ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) \ - -export-dynamic \ -- @GLIB_DEPLIBS@ \ - @x_ldflags@ \ -- @x_libs@ \ -- -lm \ - @STRIP_END@ --# $(top_builddir)/gdk/libgdk.la -- -+libgtk_la_LIBADD = @STRIP_BEGIN@ \ -+ $(top_builddir)/gdk/libgdk.la \ -+ @x_libs@ \ -+ @GDK_WLIBS@ \ -+ @GLIB_LIBS@ \ -+ -lm \ -+ @STRIP_END@ - - # - # setup source file variables -@@ -374,14 +376,17 @@ - - - gtkconfdir = $(sysconfdir)/gtk --gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \ -+# removed references to non-existent gtkrc files - tsh -+gtkconf_DATA = \ -+ gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \ - gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \ -- gtkrc.utf-8 gtkrc.iso-8859-2 \ -- gtkrc.iso-8859-3 gtkrc.iso-8859-5 gtkrc.iso-8859-7 \ -- gtkrc.iso-8859-9 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \ -- gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 \ -- gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \ -- gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255 -+ gtkrc.iso-8859-2 gtkrc.iso-8859-5 \ -+ gtkrc.iso-8859-13 gtkrc.iso-8859-14 \ -+ gtkrc.iso-8859-15 gtkrc.zh_TW.big5 \ -+ gtkrc.zh_CN gtkrc.cp1251 gtkrc.cp1255 \ -+ gtkrc.ka_GE.georgianacademy \ -+ gtkrc.ka_GE.georgianps \ -+ gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii - - # We create a dummy theme for the default GTK+ theme - install-data-local: -@@ -428,7 +433,6 @@ - LDADDS = @STRIP_BEGIN@ \ - libgtk.la \ - $(top_builddir)/gdk/libgdk.la \ -- @x_ldflags@ \ - @x_libs@ \ - @GDK_WLIBS@ \ - @GLIB_LIBS@ \ -@@ -441,12 +445,20 @@ - testdnd_DEPENDENCIES = $(DEPS) - simple_DEPENDENCIES = $(DEPS) - #testthreads_DEPENDENCIES = $(DEPS) -+ - testgtk_LDADD = $(LDADDS) -+testgtk_LDFLAGS=@x_ldflags@ - testinput_LDADD = $(LDADDS) -+testinput_LDFLAGS = @x_ldflags@ - testselection_LDADD = $(LDADDS) -+testselection_LDFLAGS = @x_ldflags@ - testrgb_LDADD = $(LDADDS) -+testrgb_LDFLAGS = @x_ldflags@ - testdnd_LDADD = $(LDADDS) -+testdnd_LDFLAGS = @x_ldflags@ - simple_LDADD = $(LDADDS) -+simple_LDFLAGS = @x_ldflags@ -+ - #testthreads_LDADD = $(LDADDS) - - .PHONY: files test test-debug diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch b/x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch deleted file mode 100644 index 6df2032..0000000 --- a/x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix build failure with automake-1.13; fixed upstream in >=2.24.15 and >=3.0 -https://bugs.gentoo.org/467520 - -diff --git a/configure.in b/configure.in -index 27294c8..798a259 100644 ---- a/configure.in -+++ b/configure.in -@@ -61,7 +61,7 @@ dnl Initialize automake stuff - AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) - - # Specify a configuration file --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS([config.h]) - - dnl Initialize libtool - AC_PROG_LIBTOOL diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-automake.patch b/x11-libs/gtk+/files/gtk+-1.2.10-automake.patch deleted file mode 100644 index e7b4474..0000000 --- a/x11-libs/gtk+/files/gtk+-1.2.10-automake.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- docs/Makefile.am -+++ docs/Makefile.am -@@ -166,7 +166,7 @@ - echo $$p; \ - done - --EXTRA_DIST += \ -+EXTRA_DIST = \ - Changes-1.2.txt \ - debugging.txt \ - developers.txt \ ---- gdk/Makefile.am -+++ gdk/Makefile.am -@@ -30,7 +30,7 @@ - # setup source file variables - # - # GDK header files for public installation (non-generated) --gdk_public_h_sources = @STRIP_BEGIN@ \ -+gdk_public_h_sources = \ - gdk.h \ - gdkcursors.h \ - gdkrgb.h \ -@@ -38,9 +38,8 @@ - gdkkeysyms.h \ - gdkprivate.h \ - gdktypes.h \ -- gdkx.h \ --@STRIP_END@ --gdk_c_sources = @STRIP_BEGIN@ \ -+ gdkx.h -+gdk_c_sources = \ - gdk.c \ - gdkcc.c \ - gdkcolor.c \ -@@ -71,8 +70,7 @@ - MwmUtil.h \ - gxid_lib.h \ - gxid_proto.h \ -- gxid_lib.c \ --@STRIP_END@ -+ gxid_lib.c - - # - # setup GDK sources and their dependancies -@@ -79,10 +79,6 @@ - # - libgdkinclude_HEADERS = $(gdk_public_h_sources) - libgdk_la_SOURCES = $(gdk_c_sources) --MAINTAINERCLEANFILES += --EXTRA_HEADERS += --EXTRA_DIST += --EXTRA_DIST += - - # - # rules to generate built sources ---- gtk/Makefile.am -+++ gtk/Makefile.am -@@ -41,7 +41,7 @@ - # setup source file variables - # - # GTK+ header files for public installation (non-generated) --gtk_public_h_sources = @STRIP_BEGIN@ \ -+gtk_public_h_sources = \ - gtk.h \ - gtkaccelgroup.h \ - gtkaccellabel.h \ -@@ -150,13 +150,12 @@ - gtkvscrollbar.h \ - gtkvseparator.h \ - gtkwidget.h \ -- gtkwindow.h \ --@STRIP_END@ -+ gtkwindow.h - # GTK+ header files that don't get installed - gtk_private_h_sources = @STRIP_BEGIN@ \ - @STRIP_END@ - # GTK+ C sources to build the library from --gtk_c_sources = @STRIP_BEGIN@ \ -+gtk_c_sources = \ - gtkaccelgroup.c \ - gtkaccellabel.c \ - gtkadjustment.c \ -@@ -264,8 +263,7 @@ - gtkwidget.c \ - gtkwindow.c \ - fnmatch.c \ -- fnmatch.h \ --@STRIP_END@ -+ fnmatch.h - # we use our own built_sources variable rules to avoid automake's - # BUILT_SOURCES oddities - # we generate frequently rebuild files piggyback on a stamp file, so sources -@@ -284,10 +282,9 @@ - gtk.defs \ - @STRIP_END@ - # built sources that get installed with the header files --gtk_built_public_sources = @STRIP_BEGIN@ \ -+gtk_built_public_sources = \ - gtkmarshal.h \ -- gtktypebuiltins.h \ --@STRIP_END@ -+ gtktypebuiltins.h - # non-header sources (headers should be specified in the above variables) - # that don't serve as direct make target sources, i.e. they don't have - # their own .lo rules and don't get publically installed -@@ -313,9 +313,8 @@ - # - libgtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkfeatures.h - libgtk_la_SOURCES = $(gtk_c_sources) --MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources) --EXTRA_HEADERS += --EXTRA_DIST += $(gtk_private_h_sources) -+MAINTAINERCLEANFILES = $(gtk_built_public_sources) $(gtk_built_sources) -+EXTRA_DIST = $(gtk_private_h_sources) - EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources) - - # -@@ -323,7 +322,7 @@ - # - # setup autogeneration dependancies - gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc --CLEANFILES += $(gen_sources) -+CLEANFILES = $(gen_sources) - COPYING: $(gtk_built_public_sources) $(gtk_built_sources) - $(OBJECTS): COPYING # this is our oldest-source-stamp - # initial creation of the real stamp-* files diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch b/x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch deleted file mode 100644 index 7846c17..0000000 --- a/x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch +++ /dev/null @@ -1,13 +0,0 @@ -pull in string prototypes - ---- gdk/gdkinputcommon.h -+++ gdk/gdkinputcommon.h -@@ -24,6 +24,8 @@ - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -+#include -+ - #if defined(XINPUT_GXI) || defined(XINPUT_XFREE) - - /* Forward declarations */ diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch b/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch deleted file mode 100644 index 37fb7c2..0000000 --- a/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch +++ /dev/null @@ -1,9 +0,0 @@ -Fix aclocal warnings: -/usr/share/aclocal/gtk.m4:7: warning: underquoted definition of AM_PATH_GTK ---- gtk+-1.2.10/gtk.m4 -+++ gtk+-1.2.10/gtk.m4 -@@ -6,3 +6,3 @@ - dnl --AC_DEFUN(AM_PATH_GTK, -+AC_DEFUN([AM_PATH_GTK], - [dnl diff --git a/x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch b/x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch deleted file mode 100644 index a07e653..0000000 --- a/x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch +++ /dev/null @@ -1,15 +0,0 @@ -gdk_quartz_target_to_pasteboard_type_libgtk_only was moved in -a269c2f8d26a588c4b61ad605ef496e89759cc03 -https://mail.gnome.org/archives/commits-list/2013-March/msg20203.html -https://bugzilla.gnome.org/show_bug.cgi?id=704766 - ---- gtk/gtkclipboard-quartz.c -+++ gtk/gtkclipboard-quartz.c -@@ -33,6 +33,7 @@ - #include "gtktextbuffer.h" - #include "gtkquartz.h" - #include "gtkalias.h" -+#include "quartz/gdkquartz.h" - - enum { - OWNER_CHANGE, diff --git a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch deleted file mode 100644 index 451233c..0000000 --- a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9e0f33144aff8d792ab105927cf686eda0afd25e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sun, 18 May 2014 10:50:05 +0200 -Subject: [PATCH] aliasfilecheck: check for sources both in builddir & srcdir. - -The $gtk_all_c_sources variable contains both supplied and generated -sources. The former reside in $srcdir, the latter in the build directory -(cwd). - -In order to handle both kinds properly, first try to find each source -file in cwd, and then fallback to $srcdir. This makes it possible to use -out-of-source builds, and guarantees that fresh-built source files will -be used rather than pre-generated copies included in the distribution -tarball. ---- - gtk/aliasfilescheck.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh -index 31b49d4..3636a82 100755 ---- a/gtk/aliasfilescheck.sh -+++ b/gtk/aliasfilescheck.sh -@@ -6,6 +6,6 @@ if test "x$gtk_all_c_sources" = x; then - fi - - grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files --{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files -+{ for f in $gtk_all_c_sources; do if test -f ${f}; then grep '^ *# *define __' ${f}; else grep '^ *# *define __' "${srcdir-.}"/${f}; fi; done } | sed 's/.*define //;s/ *$//' | sort > actual-files - - diff expected-files actual-files && rm -f expected-files actual-files --- -1.9.3 - diff --git a/x11-libs/gtk+/files/gtk+-3.12.2-builtin-icon.patch b/x11-libs/gtk+/files/gtk+-3.12.2-builtin-icon.patch deleted file mode 100644 index 176583f..0000000 --- a/x11-libs/gtk+/files/gtk+-3.12.2-builtin-icon.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 46ac7e51d96c8ffb41c1c055fbe97474dcf096f8 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Fri, 15 Aug 2014 10:37:05 -0400 -Subject: Include image data in the builtin icon cache - - -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index c281666..9369273 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -1779,8 +1779,13 @@ else - $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) - endif - endif -- $(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index \ -- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -+ $(AM_V_GEN) $(gtk_update_icon_cache_program) \ -+ --quiet \ -+ --force \ -+ --ignore-theme-index \ -+ --include-image-data \ -+ --source builtin_icons stock-icons \ -+ > gtkbuiltincache.h.tmp && \ - mv gtkbuiltincache.h.tmp gtkbuiltincache.h - - EXTRA_DIST += \ --- -cgit v0.10.1 - diff --git a/x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch b/x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch deleted file mode 100644 index 3955677..0000000 --- a/x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix for Mac Os 10.7 - -src_compile: -gtkapplication-quartz-menu.c:265: error: incompatible type for argument 1 of 'roundf' -make[4]: *** [libgtk_3_la-gtkapplication-quartz-menu.lo] Error 1 - -More info: -https://trac.macports.org/ticket/43283 -https://bugzilla.gnome.org/show_bug.cgi?id=727366 -https://bugs.gentoo.org/show_bug.cgi?id=519058 - ---- gtk/gtkapplication-quartz-menu.c.orig 2014-05-08 01:40:39.000000000 +0200 -+++ gtk/gtkapplication-quartz-menu.c 2014-05-15 11:16:09.000000000 +0200 -@@ -30,6 +30,16 @@ - - #import - -+#if !defined(MAC_OS_X_VERSION_10_7) || \ -+MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 -+ -+@interface NSScreen (LionAPI) -+- (CGFloat)backingScaleFactor; -+- (NSRect)convertRectToBacking:(NSRect)aRect; -+@end -+ -+#endif // 10.7 -+ - #define ICON_SIZE 16 - - #define BLACK "#000000" -@@ -262,7 +272,7 @@ - } - - theme = gtk_icon_theme_get_default (); -- scale = roundf ([[NSScreen mainScreen] backingScaleFactor]); -+ scale = [[NSScreen mainScreen] respondsToSelector:@selector(backingScaleFactor)] ? roundf ([[NSScreen mainScreen] backingScaleFactor]) : 1.; - info = gtk_icon_theme_lookup_by_gicon_for_scale (theme, icon, ICON_SIZE, scale, GTK_ICON_LOOKUP_USE_BUILTIN); - - if (info != NULL) diff --git a/x11-libs/gtk+/files/gtk+-3.14.9-treeview-change-keyboard-bindings-behaviour.patch b/x11-libs/gtk+/files/gtk+-3.14.9-treeview-change-keyboard-bindings-behaviour.patch deleted file mode 100644 index c635420..0000000 --- a/x11-libs/gtk+/files/gtk+-3.14.9-treeview-change-keyboard-bindings-behaviour.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c -index 0f700f8..3f9e727 100644 ---- a/gtk/gtktreeview.c -+++ b/gtk/gtktreeview.c -@@ -1584,22 +1584,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS - GTK_MOVEMENT_PAGES, 1); - - -- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, 0, "move-cursor", 2, -- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS, -- G_TYPE_INT, 1); -- -- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, 0, "move-cursor", 2, -- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS, -- G_TYPE_INT, -1); -- -- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, 0, "move-cursor", 2, -- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS, -- G_TYPE_INT, 1); -- -- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, 0, "move-cursor", 2, -- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS, -- G_TYPE_INT, -1); -- - gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK, - "move-cursor", 2, - G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS, -@@ -1651,6 +1635,16 @@ G_GNUC_END_IGNORE_DEPRECATIONS - G_TYPE_BOOLEAN, TRUE, - G_TYPE_BOOLEAN, FALSE); - -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, 0, "expand-collapse-cursor-row", 3, -+ G_TYPE_BOOLEAN, FALSE, -+ G_TYPE_BOOLEAN, TRUE, -+ G_TYPE_BOOLEAN, FALSE); -+ -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, 0, "expand-collapse-cursor-row", 3, -+ G_TYPE_BOOLEAN, FALSE, -+ G_TYPE_BOOLEAN, TRUE, -+ G_TYPE_BOOLEAN, FALSE); -+ - gtk_binding_entry_add_signal (binding_set, GDK_KEY_asterisk, 0, - "expand-collapse-cursor-row", 3, - G_TYPE_BOOLEAN, TRUE, -@@ -1662,6 +1656,16 @@ G_GNUC_END_IGNORE_DEPRECATIONS - G_TYPE_BOOLEAN, TRUE, - G_TYPE_BOOLEAN, TRUE); - -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, 0, -+ "expand-collapse-cursor-row", 3, -+ G_TYPE_BOOLEAN, FALSE, -+ G_TYPE_BOOLEAN, FALSE, -+ G_TYPE_BOOLEAN, FALSE); -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, 0, -+ "expand-collapse-cursor-row", 3, -+ G_TYPE_BOOLEAN, FALSE, -+ G_TYPE_BOOLEAN, FALSE, -+ G_TYPE_BOOLEAN, FALSE); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, 0, - "expand-collapse-cursor-row", 3, - G_TYPE_BOOLEAN, TRUE, -@@ -10973,6 +10977,7 @@ gtk_tree_view_real_expand_collapse_cursor_row (GtkTreeView *tree_view, - gboolean open_all) - { - GtkTreePath *cursor_path = NULL; -+ gboolean return_value = TRUE; - - if (!gtk_widget_has_focus (GTK_WIDGET (tree_view))) - return FALSE; -@@ -10983,31 +10988,73 @@ gtk_tree_view_real_expand_collapse_cursor_row (GtkTreeView *tree_view, - cursor_path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree, - tree_view->priv->cursor_node); - -- /* Don't handle the event if we aren't an expander */ -- if (!GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_PARENT)) -- return FALSE; -- - if (!logical - && gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL) - expand = !expand; - -- if (expand) -- gtk_tree_view_real_expand_row (tree_view, -- cursor_path, -- tree_view->priv->cursor_tree, -- tree_view->priv->cursor_node, -- open_all, -- TRUE); -+ /* If we are on a collapsed node */ -+ if (!gtk_tree_view_row_expanded(tree_view, cursor_path)) -+ { -+ if (!expand) -+ { -+ if (gtk_tree_path_up(cursor_path)) -+ { -+ /* If we try to collapse using arrows, select the parent node */ -+ if (!logical) -+ gtk_tree_view_set_cursor(tree_view,cursor_path,NULL,FALSE); -+ /* If we try to collapse a leaf node using minus, -+ cancel action and start interactive search */ -+ else if (!GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_PARENT)) -+ return_value = FALSE; -+ } -+ } -+ else if (GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_PARENT)) -+ { -+ gtk_tree_view_real_expand_row (tree_view, -+ cursor_path, -+ tree_view->priv->cursor_tree, -+ tree_view->priv->cursor_node, -+ open_all, -+ TRUE); -+ } -+ else -+ /* If we try to expand a leaf node, cancel action */ -+ return_value = !logical; -+ } -+ /* If we are on a expanded node */ -+ - else -- gtk_tree_view_real_collapse_row (tree_view, -+ { -+ if (expand) -+ { -+ if(open_all) -+ { -+ gtk_tree_view_real_expand_row (tree_view, - cursor_path, - tree_view->priv->cursor_tree, - tree_view->priv->cursor_node, -+ open_all, - TRUE); -+ } -+ -+ /* If we try to expand using arrows, select the first child */ -+ if (!logical) -+ { -+ gtk_tree_path_down(cursor_path); -+ gtk_tree_view_set_cursor(tree_view,cursor_path,NULL,FALSE); -+ } -+ } -+ else -+ gtk_tree_view_real_collapse_row (tree_view, -+ cursor_path, -+ tree_view->priv->cursor_tree, -+ tree_view->priv->cursor_node, -+ TRUE); -+ } - - gtk_tree_path_free (cursor_path); - -- return TRUE; -+ return return_value; - } - - static gboolean diff --git a/x11-libs/gtk+/files/gtk+-3.14.9-treeview-change-keyboard-bindings-behaviour.patch_original b/x11-libs/gtk+/files/gtk+-3.14.9-treeview-change-keyboard-bindings-behaviour.patch_original deleted file mode 100644 index 4100db0..0000000 --- a/x11-libs/gtk+/files/gtk+-3.14.9-treeview-change-keyboard-bindings-behaviour.patch_original +++ /dev/null @@ -1,173 +0,0 @@ -From 52269786c0a84eeed5faf33c6dd896298e71b2a6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dami=C3=A1n=20Nohales?= -Date: Mon, 2 Jul 2012 20:20:18 -0300 -Subject: [PATCH] treeview: change keyboard bindings behaviour - -This commit changes the default GtkTreeView behaviour with the keyboard, -expanding nodes with right arrow and collapsing it with left arrow, -selecting parent and child nodes when appropriate. Users that want to -navigate into cells horizontally (a non frecuent use case) will need -to press Ctrl+. ---- - gtk/gtktreeview.c | 107 +++++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 76 insertions(+), 31 deletions(-) - -diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c -index 73cd0ae..28e6500 100644 ---- a/gtk/gtktreeview.c -+++ b/gtk/gtktreeview.c -@@ -1527,22 +1527,6 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) - GTK_MOVEMENT_PAGES, 1); - - -- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, 0, "move-cursor", 2, -- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS, -- G_TYPE_INT, 1); -- -- gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, 0, "move-cursor", 2, -- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS, -- G_TYPE_INT, -1); -- -- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, 0, "move-cursor", 2, -- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS, -- G_TYPE_INT, 1); -- -- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, 0, "move-cursor", 2, -- G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS, -- G_TYPE_INT, -1); -- - gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK, - "move-cursor", 2, - G_TYPE_ENUM, GTK_MOVEMENT_VISUAL_POSITIONS, -@@ -1594,6 +1578,15 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) - G_TYPE_BOOLEAN, TRUE, - G_TYPE_BOOLEAN, FALSE); - -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, 0, "expand-collapse-cursor-row", 3, -+ G_TYPE_BOOLEAN, FALSE, -+ G_TYPE_BOOLEAN, TRUE, -+ G_TYPE_BOOLEAN, FALSE); -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Right, 0, "expand-collapse-cursor-row", 3, -+ G_TYPE_BOOLEAN, FALSE, -+ G_TYPE_BOOLEAN, TRUE, -+ G_TYPE_BOOLEAN, FALSE); -+ - gtk_binding_entry_add_signal (binding_set, GDK_KEY_asterisk, 0, - "expand-collapse-cursor-row", 3, - G_TYPE_BOOLEAN, TRUE, -@@ -1605,6 +1598,16 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) - G_TYPE_BOOLEAN, TRUE, - G_TYPE_BOOLEAN, TRUE); - -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, 0, -+ "expand-collapse-cursor-row", 3, -+ G_TYPE_BOOLEAN, FALSE, -+ G_TYPE_BOOLEAN, FALSE, -+ G_TYPE_BOOLEAN, FALSE); -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Left, 0, -+ "expand-collapse-cursor-row", 3, -+ G_TYPE_BOOLEAN, FALSE, -+ G_TYPE_BOOLEAN, FALSE, -+ G_TYPE_BOOLEAN, FALSE); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, 0, - "expand-collapse-cursor-row", 3, - G_TYPE_BOOLEAN, TRUE, -@@ -10812,6 +10815,7 @@ gtk_tree_view_real_expand_collapse_cursor_row (GtkTreeView *tree_view, - gboolean open_all) - { - GtkTreePath *cursor_path = NULL; -+ gboolean return_value = TRUE; - - if (!gtk_widget_has_focus (GTK_WIDGET (tree_view))) - return FALSE; -@@ -10822,31 +10826,72 @@ gtk_tree_view_real_expand_collapse_cursor_row (GtkTreeView *tree_view, - cursor_path = _gtk_tree_path_new_from_rbtree (tree_view->priv->cursor_tree, - tree_view->priv->cursor_node); - -- /* Don't handle the event if we aren't an expander */ -- if (!GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_PARENT)) -- return FALSE; -- - if (!logical - && gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL) - expand = !expand; -- -- if (expand) -- gtk_tree_view_real_expand_row (tree_view, -- cursor_path, -- tree_view->priv->cursor_tree, -- tree_view->priv->cursor_node, -- open_all, -- TRUE); -+ -+ /* If we are on a collapsed node */ -+ if (!gtk_tree_view_row_expanded(tree_view, cursor_path)) -+ { -+ if (!expand) -+ { -+ if (gtk_tree_path_up(cursor_path)) -+ { -+ /* If we try to collapse using arrows, select the parent node */ -+ if (!logical) -+ gtk_tree_view_set_cursor(tree_view,cursor_path,NULL,FALSE); -+ /* If we try to collapse a leaf node using minus, -+ cancel action and start interactive search */ -+ else if (!GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_PARENT)) -+ return_value = FALSE; -+ } -+ } -+ else if (GTK_RBNODE_FLAG_SET (tree_view->priv->cursor_node, GTK_RBNODE_IS_PARENT)) -+ { -+ gtk_tree_view_real_expand_row (tree_view, -+ cursor_path, -+ tree_view->priv->cursor_tree, -+ tree_view->priv->cursor_node, -+ open_all, -+ TRUE); -+ } -+ else -+ /* If we try to expand a leaf node, cancel action */ -+ return_value = !logical; -+ } -+ /* If we are on a expanded node */ - else -- gtk_tree_view_real_collapse_row (tree_view, -+ { -+ if (expand) -+ { -+ if(open_all) -+ { -+ gtk_tree_view_real_expand_row (tree_view, - cursor_path, - tree_view->priv->cursor_tree, - tree_view->priv->cursor_node, -+ open_all, - TRUE); -+ } - -- gtk_tree_path_free (cursor_path); -+ /* If we try to expand using arrows, select the first child */ -+ if (!logical) -+ { -+ gtk_tree_path_down(cursor_path); -+ gtk_tree_view_set_cursor(tree_view,cursor_path,NULL,FALSE); -+ } -+ } -+ else -+ gtk_tree_view_real_collapse_row (tree_view, -+ cursor_path, -+ tree_view->priv->cursor_tree, -+ tree_view->priv->cursor_node, -+ TRUE); -+ } - -- return TRUE; -+ gtk_tree_path_free (cursor_path); -+ -+ return return_value; - } - - static gboolean --- -1.7.9.5 - diff --git a/x11-libs/gtk+/files/gtk+-non-bash-support.patch b/x11-libs/gtk+/files/gtk+-non-bash-support.patch deleted file mode 100644 index a1aac42..0000000 --- a/x11-libs/gtk+/files/gtk+-non-bash-support.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 43a4a28cdc60ac7347bb89f84cf049cb3401621d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Cardona?= -Date: Sun, 26 Oct 2014 01:59:33 +0400 -Subject: [PATCH] gtk/Makefile.am: Remove bashisms -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- improve portability of ECHO -- remove use of shopt - -https://bugzilla.gnome.org/show_bug.cgi?id=738835 - -From: Alexander Tsoy -Signed-off-by: Rémi Cardona ---- - gtk/Makefile.am | 13 +++++-------- - 1 file changed, 5 insertions(+), 8 deletions(-) - -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 96c651a..b1478ce 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -19,11 +19,7 @@ GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings % - endif - - SUBDIRS = inspector native . --if OS_DARWIN -- ECHO="echo" --else -- ECHO=echo -e --endif -+ECHO=printf '%b\n' - - if HAVE_CLOUDPRINT - if HAVE_PAPI_CUPS -@@ -1405,12 +1401,13 @@ gtk.gresource.xml: Makefile.am - n=`basename $$f`; \ - $(ECHO) " ui/$$n" >> $@; \ - done; \ -- shopt -s nullglob; \ - for s in 16x16 22x22 24x24 32x32 48x48; do \ - for c in actions status; do \ - for f in $(srcdir)/resources/icons/$$s/$$c/*.png; do \ -- n=`basename $$f`; \ -- $(ECHO) " icons/$$s/$$c/$$n" >> $@; \ -+ if [ -e "$$f" ] ; then \ -+ n=`basename $$f`; \ -+ $(ECHO) " icons/$$s/$$c/$$n" >> $@; \ -+ fi; \ - done; \ - done; \ - done; \ --- -2.3.0 - diff --git a/x11-libs/gtk+/files/gtkrc b/x11-libs/gtk+/files/gtkrc deleted file mode 100644 index 8d17834..0000000 --- a/x11-libs/gtk+/files/gtkrc +++ /dev/null @@ -1,39 +0,0 @@ -style "default" - -{ - font = "-*-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*" -} - -style "button" = "default" - -{ - bg[PRELIGHT] = { 0.7, 0.7, 0.9 } -} - -style "treeitem" -{ -bg[ACTIVE] = { 0.7, 0.7, 0.9 } -} - -style "scrollbar" = "button" -{ - bg[ACTIVE] = {0.6, 0.6, 0.6 } -} - -style "status" { - bg[PRELIGHT] = { 0.3, 1.0, 0.3 } -} - -style "gtk-tooltips" { - bg[NORMAL] = "#ffff60" -} - -class "GtkWidget" style "default" -class "GtkButton" style "button" -class "GtkItem" style "button" -class "GtkProgressBar" style "status" -class "GtkScrollbar" style "scrollbar" -class "GtkTreeItem" style "treeitem" -widget "gtk-tooltips" style "gtk-tooltips" - - diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini deleted file mode 100644 index a65c0a8..0000000 --- a/x11-libs/gtk+/files/settings.ini +++ /dev/null @@ -1,4 +0,0 @@ -[Settings] -gtk-theme-name = Adwaita -gtk-icon-theme-name = gnome -gtk-cursor-theme-name = Adwaita diff --git a/x11-libs/gtk+/gtk+-3.14.9.ebuild b/x11-libs/gtk+/gtk+-3.14.9.ebuild deleted file mode 100644 index 8c0ef3d..0000000 --- a/x11-libs/gtk+/gtk+-3.14.9.ebuild +++ /dev/null @@ -1,243 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.9.ebuild,v 1.6 2015/03/29 10:20:53 jer Exp $ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="http://www.gtk.org/" - -LICENSE="LGPL-2+" -SLOT="3" -IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama" -REQUIRED_USE=" - || ( aqua wayland X ) - xinerama? ( X ) -" - -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# FIXME: introspection data is built against system installation of gtk+:3 -# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) -# Use gtk+:2 for gtk-update-icon-cache -COMMON_DEPEND=" - >=dev-libs/atk-2.12[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/glib-2.41.2:2[${MULTILIB_USEDEP}] - media-libs/fontconfig[${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] - >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}] - >=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}] - >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - - cloudprint? ( - >=net-libs/rest-0.7[${MULTILIB_USEDEP}] - >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) - colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) - cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.39 ) - wayland? ( - >=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}] - media-libs/mesa[wayland,${MULTILIB_USEDEP}] - >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] - ) - X? ( - >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXcomposite[${MULTILIB_USEDEP}] - x11-libs/libXdamage[${MULTILIB_USEDEP}] - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.1.2 - dev-libs/libxslt - dev-libs/gobject-introspection-common - >=dev-util/gdbus-codegen-2.38.2 - >=dev-util/gtk-doc-am-1.20 - sys-devel/gettext - virtual/pkgconfig[${MULTILIB_USEDEP}] - X? ( - x11-proto/xextproto[${MULTILIB_USEDEP}] - x11-proto/xproto[${MULTILIB_USEDEP}] - x11-proto/inputproto[${MULTILIB_USEDEP}] - x11-proto/damageproto[${MULTILIB_USEDEP}] - xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) - ) - test? ( - media-fonts/font-misc-misc - media-fonts/font-cursor-misc ) -" -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 -# >=xorg-server-1.11.4 needed for -# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html -RDEPEND="${COMMON_DEPEND} - !=x11-themes/adwaita-icon-theme-3.14 - X? ( !