diff options
author | Pacho Ramos <pacho@gentoo.org> | 2014-04-26 17:55:43 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2014-04-26 17:55:43 +0000 |
commit | aaf8bb37c01c98168613839da56399e78d4893d8 (patch) | |
tree | e33dfac75dcf171d171ec296df19b58fe9e45bbe /gnome-base | |
parent | Bump to 0.9.4, add live ebuild, bug #507440. Thanks to Nikoli. (diff) | |
download | historical-aaf8bb37c01c98168613839da56399e78d4893d8.tar.gz historical-aaf8bb37c01c98168613839da56399e78d4893d8.tar.bz2 historical-aaf8bb37c01c98168613839da56399e78d4893d8.zip |
drop old
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/dconf/ChangeLog | 5 | ||||
-rw-r--r-- | gnome-base/dconf/Manifest | 10 | ||||
-rw-r--r-- | gnome-base/dconf/dconf-0.16.1.ebuild | 75 | ||||
-rw-r--r-- | gnome-base/gdm/ChangeLog | 5 | ||||
-rw-r--r-- | gnome-base/gdm/Manifest | 14 | ||||
-rw-r--r-- | gnome-base/gdm/gdm-3.8.4-r3.ebuild | 240 | ||||
-rw-r--r-- | gnome-base/gnome-common/ChangeLog | 5 | ||||
-rw-r--r-- | gnome-base/gnome-common/Manifest | 10 | ||||
-rw-r--r-- | gnome-base/gnome-common/gnome-common-3.7.4.ebuild | 20 | ||||
-rw-r--r-- | gnome-base/gnome-core-apps/ChangeLog | 5 | ||||
-rw-r--r-- | gnome-base/gnome-core-apps/Manifest | 9 | ||||
-rw-r--r-- | gnome-base/gnome-core-apps/gnome-core-apps-3.8.0.ebuild | 57 |
12 files changed, 32 insertions, 423 deletions
diff --git a/gnome-base/dconf/ChangeLog b/gnome-base/dconf/ChangeLog index d49ff0a7ca78..ca90ba37dec4 100644 --- a/gnome-base/dconf/ChangeLog +++ b/gnome-base/dconf/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gnome-base/dconf # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/ChangeLog,v 1.56 2014/03/09 11:57:55 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/ChangeLog,v 1.57 2014/04/26 17:52:12 pacho Exp $ + + 26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -dconf-0.16.1.ebuild: + drop old 09 Mar 2014; Pacho Ramos <pacho@gentoo.org> dconf-0.18.0.ebuild: x86 stable, bug 499954 diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest index 68ec18e28e9a..6362a89b2f16 100644 --- a/gnome-base/dconf/Manifest +++ b/gnome-base/dconf/Manifest @@ -2,17 +2,15 @@ Hash: SHA256 DIST dconf-0.12.1.tar.xz 202112 SHA256 3cd32b78d88ed7be90dace5d45e2cf8a6abdb253d43dbfa5ef52103b329dc214 SHA512 40206275d5d096dc229d8f12990e437aad8bce43d071300637ed642303eac9ae245d589aee4732a8c55711c41f5653ef2a7ceb80726ede8b8502b5de48003285 WHIRLPOOL 3b509c891802d8a293dd2588b08b6cfe90525d92c5b257a924586a002c70f47e6db316a328adae5ab44e5825cc267a7e71d87609ca4335d10500dd93d75ea7c9 -DIST dconf-0.16.1.tar.xz 373800 SHA256 a551d04d06599ee9adde500c71ad8567d68f45420b6dbca10ca51e2834d80fee SHA512 8ec267fd8e769da4e4316e697e76eeb228ad2699e7aad8b2d1034314073c650ac880449a8be79e5c86ba263db89a12eabc1cd40bbb1edf0b0c710e2e32567f78 WHIRLPOOL 53b7c4e3465a43547c8da9856bb0e97b0b28a020565d9afa9cc4992c11e60b3ad30cff702422c53c79b99e13f356b39a36e93bea57b316a7dfd97f355a420211 DIST dconf-0.18.0.tar.xz 378072 SHA256 109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955 SHA512 618c46b6949ccd8d0ae0a0ee7864882d31dd4dcd56170100a92c59427014783284ed005579e5e98796ace90b6ef2656a6a12361b584641cef092e77a031de9e5 WHIRLPOOL cf8def231aad7e3260ade6ed40f3f6758f09d2f06e205332f740548ccbeac2a669e7a1f1bb07543f8a0b922ceff5b184cc2edb7ce299fbbcf5163e3e964c2e11 EBUILD dconf-0.12.1.ebuild 1717 SHA256 83a6b7b2e2fcf2eb44950338d94c61bd532396cf8d400b27d85aa8af1695568a SHA512 c1b262ef288c11f6bbe8e2d6e4c2547494332b0127021bf5b3ddc6a01b3d3c4aea122159ce695b51f5c3a75826effc7f77bfb43f438e039534fedcb4dbd209fb WHIRLPOOL e786aad707b02c34b2a876b67383eb8b0c02bac2d7346f520a344cf1a8ece405314b6d091fd3c859e93390877f043520f31415b50ab4e4a752051c5ef879c15a -EBUILD dconf-0.16.1.ebuild 1868 SHA256 4332cc7a0618cc2d74d7799c287021f51c2bce6f56b3af7160f6dfc421cc58ff SHA512 c19bc508e1df9afe88dbe960ac52bb5199da3c3ab043372485f8e055377b0667c04ccb546e606f0595b40f3d81cd5e45fac2389499708d3ed02934d87204c9ae WHIRLPOOL afd9c86286a5e6b1af7b63c7667e30064a6c4b91a30fb6a0fcc1ad8ee80f012d76f2065eb806003f72ad239d0ee27a868e59866075d2fbce8dd2f710f98cbccb EBUILD dconf-0.18.0.ebuild 1868 SHA256 78eb16950ab40f9b7d2d8c564fb511c5de7f9d1c086e2a3777eeaa5c444753a5 SHA512 2a87d90f86d81fe77ed70eff43215e53ef792fded9cbc0cc48a6ed8441b11d1c4f09bcd3562f299dcab623ee0ccf4d49fca011ff045d57e481eb76206551d64c WHIRLPOOL c36e92b5eb10cd17dd5b08aaf90f8de97bb1ed885f4239f54c7f57e0978db781e6e86ad7978e1dfcb5b2a0cfcbf35c72c2a84917abb3fbc1b620db6b734582e5 -MISC ChangeLog 7801 SHA256 089ca5f7bf28d70ce4054172308ea31bde3429ac52d5726f494f3745245eba43 SHA512 beed93184c9a9bbc3da32972e5645c943974dcb08831a5a50266f0099116df0352e9f0fcfdd94bac64eb471879d35d590bed4a994b416a81b1f50d067bb5fdd0 WHIRLPOOL 7e73922874ba08600474d918eece444b3195837e3d634b535fb6d187cc8b123eacea81d8c5221825c98d56193eb9dda271233aa97a8297f20a0525a98420a26a +MISC ChangeLog 7881 SHA256 cf19a7ffd8693636f914e80c171f300221d9d6acc97e6b8b29e49251c33c42ba SHA512 9b378faa902925ad0e06e8c5e8d917ba84704f6778371c526286737619a29a1cc2894b32ca2c470f7e1d2686ad908734b8bc1dd11a45ef817a946c972fa3a695 WHIRLPOOL d8318b84ba7b211dbcb6207a6150793cff88d8a96ec9eac15289a5b7ca4b01a3930032eb12585fa346645567cc939262aecc776695848ce966fdc8ddec9e953c MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlMcV0QACgkQCaWpQKGI+9SaKACZASbTyQghdCdC2GhK4dbKVUtZ -6PgAoIhRkcXCAjciN3RxdLogfZ7QT6/y -=fBYH +iEYEAREIAAYFAlNb8k0ACgkQCaWpQKGI+9SVnwCdGLe28D1eZHOK5Q/vcF+txpgZ +prsAnRXvw3fn+6/nZrDbzq6/GWthJBl6 +=7Hov -----END PGP SIGNATURE----- diff --git a/gnome-base/dconf/dconf-0.16.1.ebuild b/gnome-base/dconf/dconf-0.16.1.ebuild deleted file mode 100644 index 3a51a619f88d..000000000000 --- a/gnome-base/dconf/dconf-0.16.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/dconf/dconf-0.16.1.ebuild,v 1.4 2013/12/08 18:24:29 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 bash-completion-r1 virtualx - -DESCRIPTION="Simple low-level configuration system" -HOMEPAGE="https://wiki.gnome.org/dconf" - -LICENSE="LGPL-2.1+" -SLOT="0" - -# TODO: coverage ? -IUSE="test +X" - -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux" - -RDEPEND=" - >=dev-libs/glib-2.35.2:2 - sys-apps/dbus - X? ( - >=dev-libs/libxml2-2.7.7:2 - >=x11-libs/gtk+-3.4:3 ) -" -DEPEND="${RDEPEND} - dev-libs/libxslt - dev-util/gdbus-codegen - >=dev-util/gtk-doc-am-1.15 - >=dev-util/intltool-0.50 - sys-devel/gettext - virtual/pkgconfig -" - -src_configure() { - gnome2_src_configure \ - --disable-gcov \ - --enable-man \ - $(use_enable X editor) \ - VALAC=$(type -P valac-0.18) # harmless even if valac-0.18 not found -} - -src_test() { - Xemake check -} - -src_install() { - gnome2_src_install - - # GSettings backend may be one of: memory, gconf, dconf - # Only dconf is really considered functional by upstream - # must have it enabled over gconf if both are installed - echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf - echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf - doenvd 51dconf - - # Install bash-completion file properly to the system - rm -rv "${ED}usr/share/bash-completion" || die - dobashcomp "${S}/bin/completion/dconf" -} - -pkg_postinst() { - gnome2_pkg_postinst - # Kill existing dconf-service processes as recommended by upstream due to - # possible changes in the dconf private dbus API. - # dconf-service will be dbus-activated on next use. - pids=$(pgrep -x dconf-service) - if [[ $? == 0 ]]; then - ebegin "Stopping dconf-service; it will automatically restart on demand" - kill ${pids} - eend $? - fi -} diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index 064c390d0c97..38c9770d74a1 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gnome-base/gdm # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.398 2014/03/29 21:09:09 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.399 2014/04/26 17:52:51 pacho Exp $ + + 26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -gdm-3.8.4-r3.ebuild: + drop old 29 Mar 2014; Alexandre Rostovtsev <tetromino@gentoo.org> gdm-3.8.4-r3.ebuild, gdm-3.10.0.1.ebuild, gdm-3.10.0.1-r1.ebuild: diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 5d51b1f92d89..cad75bb55473 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -23,23 +23,17 @@ DIST gdm-2.20.11.tar.bz2 4013059 SHA256 2e21c9a44941cd0033aaa6b381b563488bbdd0ad DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9 SHA512 aaf0f4bfdb13f6dc81dbfe93b144343b6a8146698450fce9753396c92bef2c4e699f3f5c2ff9b88736432d2fcb861ab8dc423148109cb9194983e0c07baa8aa5 WHIRLPOOL 698cd66740872260a106f8174a51a44a45817112d696b2741fd537a10362308ffa8917df31190fe042c46b7ea76e2f8d1147f5c15e39cfb33f1f2f7e951ffb78 DIST gdm-3.10.0.1-patches.tar.xz 10116 SHA256 249b0676498477aaa4da70ea1f39d9612222b1dbd8100cbdbd7b46a37998ed94 SHA512 f4cbf9f96c8f999601bf9e940af6db7172f79013355779869cbbf4be0a6bdecc808bc536a0267608095cd2af362226c291c8f8deac5a642534d31af5007cdbee WHIRLPOOL 51cdbf01ca64154d65152fff69ed3476619c850358a87dae9a765ce2c0bdea2c8a74a3ff2cb6c2660799b519b4e54e1631f0898422c5461ccc2b8551d84222b2 DIST gdm-3.10.0.1.tar.xz 1552460 SHA256 549a42009af9c79a4e07632e405dcb71ba2e876e766cff02471511ad641b6ae7 SHA512 9c108fd70324c17bd93c1f9ad74a87404350041c4d0c45f72c233a1414202b107502f0154486d8c8cceb9f0826275608045539c8bc96cbc6ef5350fc55d5462a WHIRLPOOL 34dd4595ad94822703b4c9d49ce413b64a93e0ccd50bd757dbdf79b592fb714b24d9c9b87d852d04d62750bec3daa3039e5d0d70ff03611c698f63b3b91c9404 -DIST gdm-3.8.4.tar.xz 1677040 SHA256 db40fb66bf476721b6d333abe0bfed7feacdca7d492f971c86a3f1e5cccdb447 SHA512 a64df8a4b7e1000aadfe1433b1d0f5d9bd16eeca45f1fdf36adc207a9f1dd410cf8e888553205135952a6da30b8c9efd4a240fc3f454636e0c9e4f86414a3283 WHIRLPOOL 4d3fe4cbd084a169bce29481271c99a8e9523cd6b1d163e4e1dc5cd829097daf9339de538d43998109596b41bde34ff798d2eaf607f38c5c859ee3b526f7e04e DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a WHIRLPOOL bac9f9ef3e7e88401e605c34deca6e7c31e2d4456af3781252a91f7bc33084af27ecc9e4a74022767b25db23d8f70842a39225c8544f1c02229ad7f7af670d42 DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153 EBUILD gdm-2.20.11-r1.ebuild 7373 SHA256 0a27e4a2c37ba6980cc886ddfafdbce65c88d29cd66b79c95d04832f3b993b10 SHA512 493f7d8863fda71849ea7c3385889c1bfa3fe1e95060d0b4c1842338c46aaa912474de38c8531158cdba12db0e24baff1e9b215ab9ad52d6ea8504a857398fc4 WHIRLPOOL d89f68ad7b60493bf6f0bd1cb725942da9b050a10c9cc2c955f541f9e19a1b7ca99fccee6fb2b5dcf944c074c6dde70befb81f2f15a0bff730a53f7698867af3 EBUILD gdm-3.10.0.1-r1.ebuild 6962 SHA256 858a14faf985fb6032973e237f9f2cf4c71d831f61fc3b1629273ef637d7bdcc SHA512 336816e88b132dba1f2c01a8141659fcfa1010ce7f8d0e88723c3eac92e145ab93c319c34716345ed4a953abfc7fa9074ae03dece6aa5c074fa9882696fd6884 WHIRLPOOL 1d7016054550bf5096e1cdde4fa2146fca74edc7da11135a06b6432c4e600615a785a43b91ba7736419f26b6c626066e0a570fe14d201f1bf869fb819a0846e0 EBUILD gdm-3.10.0.1.ebuild 6653 SHA256 e0d0a77328dc16ceaede4ac129a0f452e51aa085fcc9017520e48570858ed84f SHA512 c5720e5c096ee26551deb1dd3cd17a5b56795090a98bfa2423b4012230e81eccad148e266acd1b66013b8fece01370b0b36a589e73da207d401427318d38cf27 WHIRLPOOL 475d4992ee71a07b4c81ed52eae8610683d2e91e1031dad8f37232f0fb7831258fbfa6d1d1038733106f8e08bb159d3006b4b1203c6b6f80a1d8340b5c5d3099 -EBUILD gdm-3.8.4-r3.ebuild 7179 SHA256 a5725a78a5eaf6a1415a5588e07f2347f5cadf9090473f945f71ffbe772714c9 SHA512 4cb3198626090a6cbdf080eceeac2384595d54e13a5c2a38335259d276408266fad3dc78e86855e1469c5ea10ac65caee4bb0f80ce6f8586444a771339f0db13 WHIRLPOOL fc2c7dde848ee0236b254be01ce54fbe5f27d27bf8548937b6eba538b42c6eb54787bdc29a3de1556d6e8a8de171cbccccd07be2096c24b7a2a01c3264d14352 -MISC ChangeLog 61160 SHA256 9abc025af3ab214358b83c8df6e4bbc48a716c45e53468eb59efee4303e803ed SHA512 7962f336c52a671d36583c7ea450fa6f68c940499bbd96d3a0c8aa834f494f3e237ea4e0fa2ec26cc486b7dd315edae0e53da85af083a091f7c03dbdafb7c75a WHIRLPOOL b9fab78a2fceb044d9d78054708307803138a4e05aa0b46a2b7fc32ac13d3778a72262060fa7d2c38fc21255beff46d72df95a711b70bf1fb3f8f08463c5598c +MISC ChangeLog 61236 SHA256 f7d8862d6870088dbe1cec13807579102b19c4fabe1781b570d943e7b19a3bde SHA512 243731208096121f950aa45dc268b45fdef95b88a58fd32024d7e7979c8f2c98288896ce89f19cbd780c696dff57c8afe9431e7d70282d9d217904900244d47d WHIRLPOOL 9581ae64fc74eb3eea8b3e213a287152bd1691475d337dc43558845ef5820d875f1483f3cef8ee04df7aa5adeb650d5fbdd377b2186cc9c152e5dcf012d0d122 MISC metadata.xml 944 SHA256 08ee2dd40862efd5316443b8d84df4a1dafca76236e0f107240d8ccb6a0d0087 SHA512 f1ca94a651af983dd0e8b8b346be9c682011ec1c9a3293bb54fdd4a6effae14cd4a8efe2dfff7d143faad39cdcd9dab92bf7bad0244b1cca3e5e24c557963544 WHIRLPOOL dc83e5716dd4545c4daa1ee2b8aa7c6f993d0781c0518c2102c30772e683c46b56d1fe5494b6814232db434b96230c7bbd60790d158cd0f9fc24d69b91368219 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJTNzZCAAoJEJ0WA1zPCt1hvgsH/02o5hIWcDn5gOhsAN51SFxV -jSDCH5x86GIdq/Ou3qz3QkwSwWWxg0kTi+i/fsLORxj377tSg3F+rGoDBxnDqXW9 -TtSzD1R446ZTHuj5hRxbHX8hxp4JksbB3MB0TL4QupIG90IqvPPuqiSMFSvbti2q -o03Gcow11ETFTQFcXXpVJCV8qrb5kZxrY4fgzhYnlp+56ASi8tu04f3ME5OlT0Jq -o5JbF++vlTkAx1UPIjc9VjzXUprtPzCF+f4opOjfk2I0B/Ma5O9JJ9VFt4Med0BV -PEbyhUOOwMVB8uXv7f4FMXTXisMC+AqV5S2G4M0CA7vsq4wbIjXOQH+57TnvH5g= -=ZFPp +iEYEAREIAAYFAlNb8nQACgkQCaWpQKGI+9RnnACaAorCz0pyEHivzvekTKXmbzZ6 +7j8An1xPLjtChlA2fV6HdppzAZ4ta2q4 +=/A0a -----END PGP SIGNATURE----- diff --git a/gnome-base/gdm/gdm-3.8.4-r3.ebuild b/gnome-base/gdm/gdm-3.8.4-r3.ebuild deleted file mode 100644 index 695f508d012c..000000000000 --- a/gnome-base/gdm/gdm-3.8.4-r3.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.8.4-r3.ebuild,v 1.6 2014/03/29 21:09:09 tetromino Exp $ - -EAPI="5" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils gnome2 pam readme.gentoo systemd user - -DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" -HOMEPAGE="https://wiki.gnome.org/GDM" - -SRC_URI="${SRC_URI} - branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) -" - -LICENSE=" - GPL-2+ - branding? ( CC-Sampling-Plus-1.0 ) -" - -SLOT="0" -IUSE="accessibility audit branding fallback fprint +gnome-shell +introspection ipv6 plymouth selinux +systemd tcpd test xinerama" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86" - -# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 -# nspr used by smartcard extension -# dconf, dbus and g-s-d are needed at install time for dconf update -# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 -COMMON_DEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.35:2 - >=x11-libs/gtk+-2.91.1:3 - >=x11-libs/pango-1.3 - dev-libs/nspr - >=dev-libs/nss-3.11.1 - >=gnome-base/dconf-0.11.6 - >=gnome-base/gnome-settings-daemon-3.1.4 - gnome-base/gsettings-desktop-schemas - >=media-libs/fontconfig-2.5.0 - >=media-libs/libcanberra-0.4[gtk3] - sys-apps/dbus - >=sys-apps/accountsservice-0.6.12 - >=sys-power/upower-0.9 - - x11-apps/sessreg - x11-base/xorg-server - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - x11-libs/libXrandr - >=x11-misc/xdg-utils-1.0.2-r3 - - virtual/pam - systemd? ( >=sys-apps/systemd-186:0=[pam] ) - !systemd? ( - >=x11-base/xorg-server-1.14.3-r1 - >=sys-auth/consolekit-0.4.5_p20120320-r2 - !<sys-apps/openrc-0.12 - ) - sys-auth/pambase[systemd?] - - audit? ( sys-process/audit ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) - plymouth? ( sys-boot/plymouth ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) -" -# XXX: These deps are from session and desktop files in data/ directory -# at-spi:1 is needed for at-spi-registryd (spawned by simple-chooser) -# fprintd is used via dbus by gdm-fingerprint-extension -# gnome-session-3.6 needed to avoid freezing with orca -RDEPEND="${COMMON_DEPEND} - >=gnome-base/gnome-session-3.6 - x11-apps/xhost - x11-themes/gnome-icon-theme-symbolic - - fallback? ( x11-wm/metacity - accessibility? ( - app-accessibility/orca - gnome-extra/at-spi:1 ) ) - fprint? ( - sys-auth/fprintd - sys-auth/pam_fprint ) - gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 ) - !gnome-shell? ( x11-wm/metacity ) - !gnome-extra/fast-user-switch-applet -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.1.2 - >=dev-util/intltool-0.40.0 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - x11-proto/inputproto - x11-proto/randrproto - test? ( >=dev-libs/check-0.9.4 ) - xinerama? ( x11-proto/xineramaproto ) -" - -DOC_CONTENTS=" - To make GDM start at boot, run:\n - # systemctl enable gdm.service\n - \n - For passwordless login to unlock your keyring, you need to install - sys-auth/pambase with USE=gnome-keyring and set an empty password - on your keyring. Use app-crypt/seahorse for that. -" - -pkg_setup() { - enewgroup gdm - enewgroup video # Just in case it hasn't been created yet - enewuser gdm -1 -1 /var/lib/gdm gdm,video - - # For compatibility with certain versions of nvidia-drivers, etc., need to - # ensure that gdm user is in the video group - if ! egetent group video | grep -q gdm; then - # FIXME XXX: is this at all portable, ldap-safe, etc.? - # XXX: egetent does not have a 1-argument form, so we can't use it to - # get the list of gdm's groups - local g=$(groups gdm) - elog "Adding user gdm to video group" - usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" - fi -} - -src_prepare() { - # make custom session work, bug #216984 - epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch" - - # ssh-agent handling must be done at xinitrc.d, bug #220603 - epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" - - # Fix automagic selinux, upstream bug #704188 - epatch "${FILESDIR}/${PN}-3.6.0-selinux-automagic.patch" - - # Gentoo does not have a fingerprint-auth pam stack - epatch "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" - - # Make pam config compatible with non-systemd setups, bug #486822 - epatch "${FILESDIR}/${PN}-3.8.4-pam-systemd.patch" - - # make gdm-fallback session the default if USE=-gnome-shell - if ! use gnome-shell; then - sed -e "s:'gdm-shell':'gdm-fallback':" \ - -i data/00-upstream-settings || die "sed failed" - fi - - # Show logo when branding is enabled - use branding && epatch "${FILESDIR}/${PN}-3.8.4-logo.patch" - - mkdir -p "${S}"/m4 - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die - eautoreconf - - gnome2_src_prepare -} - -src_configure() { - # PAM is the only auth scheme supported - # even though configure lists shadow and crypt - # they don't have any corresponding code. - # --with-at-spi-registryd-directory= needs to be passed explicitly because - # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 - # Xevie is obsolete, bug #482304 - gnome2_src_configure \ - --with-run-dir=/run/gdm \ - --localstatedir="${EPREFIX}"/var \ - --disable-static \ - --with-xdmcp=yes \ - --enable-authentication-scheme=pam \ - --with-default-pam-config=exherbo \ - --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ - --with-consolekit-directory=${EPREFIX}/usr/lib/ConsoleKit \ - --with-initial-vt=7 \ - --without-xevie \ - $(use_with audit libaudit) \ - $(use_enable fallback fallback-greeter) \ - $(use_enable ipv6) \ - $(use_with plymouth) \ - $(use_with selinux) \ - $(use_with systemd) \ - $(use_with !systemd console-kit) \ - $(use_enable systemd systemd-journal) \ - $(systemd_with_unitdir) \ - $(use_with tcpd tcp-wrappers) \ - $(use_with xinerama) \ - ITSTOOL=$(type -P true) -} - -src_install() { - gnome2_src_install - - insinto /etc/X11/xinit/xinitrc.d - newins "${FILESDIR}/49-keychain-r1" 49-keychain - newins "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent - - # log, etc. - keepdir /var/log/gdm - - # gdm user's home directory - keepdir /var/lib/gdm - fowners gdm:gdm /var/lib/gdm - - # install XDG_DATA_DIRS gdm changes - echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm - doenvd 99xdg-gdm - - use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg - - readme.gentoo_create_doc -} - -pkg_postinst() { - local d ret - - gnome2_pkg_postinst - - dbus-launch dconf update || die "'dconf update' failed" - - # bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm - ret=0 - ebegin "Fixing "${EROOT}"var/lib/gdm ownership" - chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1 - for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do - [[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1 - done - eend ${ret} - - readme.gentoo_print_elog - - if [[ -f "/etc/X11/gdm/gdm.conf" ]]; then - elog "You had /etc/X11/gdm/gdm.conf which is the old configuration" - elog "file. It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16" - mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16 - fi -} diff --git a/gnome-base/gnome-common/ChangeLog b/gnome-base/gnome-common/ChangeLog index a1467d434777..84cf2709036c 100644 --- a/gnome-base/gnome-common/ChangeLog +++ b/gnome-base/gnome-common/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gnome-base/gnome-common # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/ChangeLog,v 1.124 2014/03/28 02:24:19 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/ChangeLog,v 1.125 2014/04/26 17:54:54 pacho Exp $ + + 26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -gnome-common-3.7.4.ebuild: + drop old 28 Mar 2014; Jeroen Roovers <jer@gentoo.org> gnome-common-3.10.0.ebuild: Stable for HPPA (bug #499954). diff --git a/gnome-base/gnome-common/Manifest b/gnome-base/gnome-common/Manifest index 3b4e72d63090..0ce6d4754591 100644 --- a/gnome-base/gnome-common/Manifest +++ b/gnome-base/gnome-common/Manifest @@ -3,16 +3,14 @@ Hash: SHA256 DIST gnome-common-3.10.0.tar.xz 152440 SHA256 aed69474a671e046523827f73ba5e936d57235b661db97900db7356e1e03b0a3 SHA512 6c6408160dc2f4132c71b6795e0f3b026d0d2737e3712294bb8cb0c097ec74d30cf70740d50c7712f38477b24ab6fd11d8872c7a3ed1919f24aa43a546e9febe WHIRLPOOL eb30b6eee40e6a13ac0a127291ba600fa25b0b2cc622180694f115df70dada6b11acf1caf18ac15b9adcc396e781d42d4a3e74a69098d83830c3bda02cd17dc5 DIST gnome-common-3.6.0.tar.xz 143636 SHA256 e10f09de06bddcc8f980422e3bfdcd8185eee7f1eae11543a765ec8e764b8d95 SHA512 67be8a96ba0ca51089c4cf02440a28cc61014b1597c269553132d9c0f907ec0d3d78a1a004181ecd1c9d5ce901cd72e3bc4ecd7fc04247f7dde33b3fd8623f0c WHIRLPOOL 41de9e82c21895b800de98117eb37dd4e01a41599488142ac44a85eb4a6ab811f7c95d71d5d2e1dba2574dbf56db354101f4f7fffff2be7f9c55ee4ab9b3aaf2 -DIST gnome-common-3.7.4.tar.xz 151864 SHA256 2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b SHA512 dbd5da8aea4c75ebf40ba1a3dee80570827f4bf061b552d605b98e547aeb7e2adc5145959cb61110b8bb6d95663baa6e5925991a5f705638c0dfd3bea64a037e WHIRLPOOL cbf4d651108c4657bc00cf2c7a3aa96ddca6674a4c3b141a4f5878c5a40c86157721980911ca7f86e96a7c94e023b22f5b71df6f7a273f21f001bdfd14f2415d EBUILD gnome-common-3.10.0.ebuild 776 SHA256 5e4e8d58458ee068aecaaf7cab151f0cb9d5948c3906733a5c3114ed049cc8e3 SHA512 5ae716cbe727f9ed4c0db1d917ba328e304657308d0dff936e293eb8fba797fcbf647f89a7ba9f7d0fb6d4af1b35c988c31ac16434aef10740c9f9a6761f5f48 WHIRLPOOL 9761c71920d4530cfe09bf03f046c23a41024a848a3a60f4e8cc6941795e1dbcd138dc16756c1096f22788b4a494c751fa670fa0f7acfd86e4e3775d4b23ac7b EBUILD gnome-common-3.6.0.ebuild 771 SHA256 8a81dc3120f5e7543b76b3d38d0db982f309533977b974c273a765774af0179b SHA512 8e33ee1a8c3c8bdc73f290614b97e808fb4a9196a09fcfcb937eae663a4228ebcf144c7ca7b23f2bd051f301b1b55d7d5efeabb50220abcb3056b4e9a47f9246 WHIRLPOOL 7a16cb664319b5604d637fdb0587bf4dbaa7038ff1b834d202d1c42695707d3cd439fd4176119b997ea376ff064d5bb92afa0b2210600e8a069772db0dc25150 -EBUILD gnome-common-3.7.4.ebuild 772 SHA256 43dea47329ae8c81de3cf18b238f6e0ff59f2b4df4884818c3b5610389b24f2d SHA512 234ba2b2d8d4ee99e0e058ec81a79574cf459782d3046a45be1624528a751be379b60d3c2c82b9ee29288535c4dd0173dbad9b33c82aaf4ded2ce8b2a2f3ce79 WHIRLPOOL 050f51d3d986776edeeb9b272acfc170bae21ac66127d1c47c219330db23c0f7dffb3a9d4a5e7a456bd571a3095a35510a42d5dcf9e9447d0079d3effd3ed8de -MISC ChangeLog 14911 SHA256 aef01bc95c53469a538f36f98124ab11a168b9fdaee8ac4e128c1bd31bf9cf73 SHA512 7c2bdcc5349735d3f530284ab6a08e61235b84c469fc6db44e7164530b4cc62173bb90b9e42c933e5cbebd13c4a0bce9c0e3168f58941d5049c27edf13d751b1 WHIRLPOOL c5eb3eae56296ed6bb23048a24a5f0093dbd3ef931a21a1e6534f63df86140a98849d65752c3535bb8f41cbe34dbe85f74ab28430e35e5c870a5f3f3a8907ad9 +MISC ChangeLog 14999 SHA256 694d7f1276b5e32171c8f7c751d71be5cd73f88880a9ff99a9057c79a4048b67 SHA512 e074e7aab94dffbb230ba463b2a62769a7c00f710be73e594e29dd88d43822282b5c0861b5a1ff85d4a2ee6c847cec77a16c3b24e22af79e43ecec287a526b6c WHIRLPOOL e5479921f0f276f00167529a9f0145ff3e73bd43d293ab7cc76c7896963ceb0de840edc1c22d7a6f6a26edebfd165c280ab2a953c6ecb5d717c0f3c82a4a3188 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlM03VQACgkQVWmRsqeSphNCCgCcCFkK4dWxboUVC1Ntk1VbtR2V -UDkAn3aAv52WbJPslKEdrHMzPspirlUJ -=WgkP +iEYEAREIAAYFAlNb8u8ACgkQCaWpQKGI+9R4YACfR8GO2gnP2A7jMDsfJ27Gdiou +RFwAniqIPxacsWkGP51H0PFVyiJrXrDX +=oUMU -----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-common/gnome-common-3.7.4.ebuild b/gnome-base/gnome-common/gnome-common-3.7.4.ebuild deleted file mode 100644 index f2ee77d1ed69..000000000000 --- a/gnome-base/gnome-common/gnome-common-3.7.4.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-common/gnome-common-3.7.4.ebuild,v 1.5 2013/12/22 16:02:56 jer Exp $ - -EAPI=5 -inherit gnome.org - -DESCRIPTION="Common files for development of Gnome packages" -HOMEPAGE="http://git.gnome.org/browse/gnome-common" - -LICENSE="GPL-3" -SLOT="3" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -src_install() { - default - mv doc-build/README README.doc-build || die "renaming doc-build/README failed" - dodoc ChangeLog README* doc/usage.txt -} diff --git a/gnome-base/gnome-core-apps/ChangeLog b/gnome-base/gnome-core-apps/ChangeLog index d961f4f7867f..caf768aa2fc7 100644 --- a/gnome-base/gnome-core-apps/ChangeLog +++ b/gnome-base/gnome-core-apps/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gnome-base/gnome-core-apps # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-apps/ChangeLog,v 1.24 2014/03/09 11:58:13 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-apps/ChangeLog,v 1.25 2014/04/26 17:55:42 pacho Exp $ + + 26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -gnome-core-apps-3.8.0.ebuild: + drop old 09 Mar 2014; Pacho Ramos <pacho@gentoo.org> gnome-core-apps-3.10.0.ebuild: x86 stable, bug 499954 diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest index 8db940ce77f5..30eddf563c47 100644 --- a/gnome-base/gnome-core-apps/Manifest +++ b/gnome-base/gnome-core-apps/Manifest @@ -2,13 +2,12 @@ Hash: SHA256 EBUILD gnome-core-apps-3.10.0.ebuild 1664 SHA256 7b210cb344897c2692c6a0c1d7fb6c13b4385f8c0418f336089f9e06e5109b78 SHA512 5d596ed86e4d7da39dcc5a33a61ce8d3d8d7bdbf6af85b002b3df073b5d38164e7f8607fc69744a772f7678823029e91bcf7476d0fb74628ab5175738174cc47 WHIRLPOOL 82a6c8358b93433fbeba430bc50e6a011d049298f2cb3b38874663e8094dab8b33de478cd541844c88f20a6bdecb25ad43f1a3b0025afc985efa9887af38893d -EBUILD gnome-core-apps-3.8.0.ebuild 1663 SHA256 7478ba09600ddfbabc6aa0ae4bf796fa1e7ae8c4a49b246dc8ca7058ad3d4418 SHA512 8a4a7dcf66168c9134d37ced764009e78af38bcc82242bc7b13ed04e71edca47a41bf842d6426b9883bd93308f967f07de44f5eb3314097fab8ad496264ebbb9 WHIRLPOOL 3875f36eba1aaa96281410e2d64a491e2abc412e8313a9580ad488abf264f3d21cb0daa0ae952b0889ac24d516d8ee4aa16d2fb8a501f2e621c503e4dbe0efda -MISC ChangeLog 3637 SHA256 cce698d21abc42deb4b55bc642b8c5ef3e6f3b9737728bf1d3782f7d2959efa4 SHA512 f77ef8eb003d6731a8264f67dbd1adeedb2bbd49815096e40548aad33fa45fbd3670379d2cf8889f1df79b9968ea76a90992f1ada2ebbd04214ae7cbee976ff7 WHIRLPOOL bcefb30888f862e0c7b0e68ac68b3dc9d363cc6bb7bec8780e8ff068ab7fdef478ca22b6415f128efaaa56d03c9b41513ecb8ae61d395d8fcf312d462011fd1a +MISC ChangeLog 3726 SHA256 21c6a5764dbb284aeba27e1e7196d43868fd8bf9bbbe6755067469782d602717 SHA512 10d400174c634b18fd95a5e83e564eab6a58def4e0febc8205381631ab4e85285229806877f7256e1c178f8e39339501686c6625ad5491c56836bc867817591b WHIRLPOOL 37be3273d3e0ffff02495050ba5b507e91a6ccb8b6e20b094707d4feaf2ee82f4b3ba7880f3688fe04e8b01d4025445e3abcb165c2a4a2da2a3a537c7f095c03 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlMcV1cACgkQCaWpQKGI+9SqiACghYsiZCFA3VcOUX4JwAe1WGph -88EAnjdjGPiLrnTTzufyMOfpVTK9A9SM -=NEa1 +iEYEAREIAAYFAlNb8x8ACgkQCaWpQKGI+9RdrgCfR8v2EM9AS5Neb/nxWr3kDSaL +8NMAn3xRaVv4hLug68KsHPekagMQdVL/ +=5i0l -----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.8.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.8.0.ebuild deleted file mode 100644 index ab330652c284..000000000000 --- a/gnome-base/gnome-core-apps/gnome-core-apps-3.8.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-apps/gnome-core-apps-3.8.0.ebuild,v 1.6 2013/12/08 18:27:27 pacho Exp $ - -EAPI="5" - -DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3" -HOMEPAGE="http://www.gnome.org/" -LICENSE="metapackage" -SLOT="3.0" -IUSE="+bluetooth +cdr cups" - -# when unmasking for an arch -# double check none of the deps are still masked ! -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" - -# Note to developers: -# This is a wrapper for the core apps tightly integrated with GNOME 3 -# gtk-engines:2 is still around because it's needed for gtk2 apps -RDEPEND=" - >=gnome-base/gnome-core-libs-${PV}[cups?] - - >=gnome-base/gnome-session-${PV} - >=gnome-base/gnome-menus-${PV}:3 - >=gnome-base/gnome-settings-daemon-${PV}[cups?] - >=gnome-base/gnome-control-center-${PV}[cups?] - - >=app-crypt/gcr-${PV} - >=gnome-base/nautilus-${PV} - >=gnome-base/gnome-keyring-${PV} - >=gnome-extra/evolution-data-server-${PV} - - >=app-crypt/seahorse-${PV} - >=app-editors/gedit-${PV} - >=app-text/evince-${PV} - >=gnome-extra/gnome-contacts-${PV} - >=media-gfx/eog-${PV} - >=media-video/totem-${PV} - >=net-im/empathy-${PV} - >=x11-terms/gnome-terminal-${PV} - - >=gnome-extra/gnome-user-docs-${PV} - >=gnome-extra/yelp-${PV} - - >=x11-themes/gtk-engines-2.20.2:2 - >=x11-themes/gnome-icon-theme-${PV} - >=x11-themes/gnome-icon-theme-symbolic-${PV} - >=x11-themes/gnome-themes-standard-${PV} - - bluetooth? ( >=net-wireless/gnome-bluetooth-${PV} ) - cdr? ( >=app-cdr/brasero-${PV} ) - - !gnome-base/gnome-applets -" -DEPEND="" - -S="${WORKDIR}" |